November 2011 - Wine-commits

Rico Schüller : d3dx9: Handle a special case in ID3DXBaseEffect::GetInt().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: aaa593c094f416c9d63989c673836235d480ec93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa593c094f416c9d63989c67… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Nov 24 22:36:13 2011 +0100 d3dx9: Handle a special case in ID3DXBaseEffect::GetInt(). --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 9e0063a..3458b45 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -26,6 +26,9 @@ #include "wingdi.h" #include "d3dx9_36_private.h" +/* Constants for special INT/FLOAT conversation */ +#define INT_FLOAT_MULTI 255.0f + WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl; @@ -1703,11 +1706,31 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHAN TRACE("iface %p, parameter %p, n %p\n", This, parameter, n); - if (n && param && !param->element_count && param->columns == 1 && param->rows == 1) + if (n && param && !param->element_count) { - *n = get_int(param->type, param->data); - TRACE("Returning %i\n", *n); - return D3D_OK; + if (param->columns == 1 && param->rows == 1) + { + *n = get_int(param->type, param->data); + TRACE("Returning %i\n", *n); + return D3D_OK; + } + + if (param->type == D3DXPT_FLOAT && + ((param->class == D3DXPC_VECTOR && param->columns != 2) + || (param->class == D3DXPC_MATRIX_ROWS && param->rows != 2 && param->columns == 1))) + { + /* all components (3,4) are clamped (0,255) and put in the INT */ + *n = (INT)(min(max(0.0f, *((FLOAT *)param->data + 2)), 1.0f) * INT_FLOAT_MULTI); + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 1)), 1.0f) * INT_FLOAT_MULTI)) << 8; + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 0)), 1.0f) * INT_FLOAT_MULTI)) << 16; + if (param->columns * param->rows > 3) + { + *n += ((INT)(min(max(0.0f, *((FLOAT *)param->data + 3)), 1.0f) * INT_FLOAT_MULTI)) << 24; + } + + TRACE("Returning %i\n", *n); + return D3D_OK; + } } WARN("Invalid argument specified\n");

1 0

Jacek Caban : jscript: Use bytecode for new expression implementation.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 518f4c498383cc0fe065edcccdc812e2581c0c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=518f4c498383cc0fe065edccc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 12:05:07 2011 +0100 jscript: Use bytecode for new expression implementation. --- dlls/jscript/compile.c | 22 ++++++++++++++ dlls/jscript/engine.c | 75 +++++++++++++++++++++++++++-------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 67 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5c830d2..492ca3c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -227,6 +227,26 @@ static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_e return S_OK; } +static HRESULT compile_new_expression(compiler_ctx_t *ctx, call_expression_t *expr) +{ + unsigned arg_cnt = 0; + argument_t *arg; + HRESULT hres; + + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + for(arg = expr->argument_list; arg; arg = arg->next) { + hres = compile_expression(ctx, arg->expr); + if(FAILED(hres)) + return hres; + arg_cnt++; + } + + return push_instr_int(ctx, OP_new, arg_cnt); +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -300,6 +320,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); + case EXPR_NEW: + return compile_new_expression(ctx, (call_expression_t*)expr); case EXPR_NOTEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq); case EXPR_NOTEQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9244eff..7e78c83 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -96,9 +96,16 @@ static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) static inline VARIANT *stack_top(exec_ctx_t *ctx) { + assert(ctx->top); return ctx->stack + ctx->top-1; } +static inline VARIANT *stack_topn(exec_ctx_t *ctx, unsigned n) +{ + assert(ctx->top > n); + return ctx->stack + ctx->top-1-n; +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -1594,51 +1601,55 @@ static HRESULT args_to_param(script_ctx_t *ctx, argument_t *args, jsexcept_t *ei return S_OK; } +static void jsstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) +{ + VARIANT tmp; + unsigned i; + + dp->cArgs = arg_cnt; + dp->rgdispidNamedArgs = NULL; + dp->cNamedArgs = 0; + + assert(ctx->top >= arg_cnt); + + for(i=1; i*2 <= arg_cnt; i++) { + tmp = ctx->stack[ctx->top-i]; + ctx->stack[ctx->top-i] = ctx->stack[ctx->top-arg_cnt+i-1]; + ctx->stack[ctx->top-arg_cnt+i-1] = tmp; + } + + dp->rgvarg = ctx->stack + ctx->top-arg_cnt; +} + /* ECMA-262 3rd Edition 11.2.2 */ -HRESULT new_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_new(exec_ctx_t *ctx) { - call_expression_t *expr = (call_expression_t*)_expr; - exprval_t exprval; - VARIANT constr, var; + const LONG arg = ctx->parser->code->instrs[ctx->ip].arg1.lng; + VARIANT *constr, v; DISPPARAMS dp; HRESULT hres; - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; + TRACE("%d\n", arg); - hres = args_to_param(ctx, expr->argument_list, ei, &dp); - if(SUCCEEDED(hres)) - hres = exprval_to_value(ctx, &exprval, ei, &constr); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; + constr = stack_topn(ctx, arg); /* NOTE: Should use to_object here */ - if(V_VT(&constr) == VT_NULL) { - VariantClear(&constr); - return throw_type_error(ctx, ei, JS_E_OBJECT_EXPECTED, NULL); - } else if(V_VT(&constr) != VT_DISPATCH) { - VariantClear(&constr); - return throw_type_error(ctx, ei, JS_E_INVALID_ACTION, NULL); - } else if(!V_DISPATCH(&constr)) { - VariantClear(&constr); - return throw_type_error(ctx, ei, JS_E_INVALID_PROPERTY, NULL); - } + if(V_VT(constr) == VT_NULL) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_OBJECT_EXPECTED, NULL); + else if(V_VT(constr) != VT_DISPATCH) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_INVALID_ACTION, NULL); + else if(!V_DISPATCH(constr)) + return throw_type_error(ctx->parser->script, &ctx->ei, JS_E_INVALID_PROPERTY, NULL); - hres = disp_call(ctx, V_DISPATCH(&constr), DISPID_VALUE, - DISPATCH_CONSTRUCT, &dp, &var, ei, NULL/*FIXME*/); - IDispatch_Release(V_DISPATCH(&constr)); - free_dp(&dp); + jsstack_to_dp(ctx, arg, &dp); + hres = disp_call(ctx->parser->script, V_DISPATCH(constr), DISPID_VALUE, + DISPATCH_CONSTRUCT, &dp, &v, &ctx->ei, NULL/*FIXME*/); if(FAILED(hres)) return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = var; - return S_OK; + stack_popn(ctx, arg+1); + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.2.3 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a92b942..c5681f7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -57,6 +57,7 @@ typedef struct _func_stack { X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ X(neq2, 1, 0,0) \ + X(new, 1, ARG_INT, 0) \ X(null, 1, 0,0) \ X(pop, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ @@ -538,7 +539,6 @@ typedef struct { HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index a3c54ad..617c848 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1355,7 +1355,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, array_expression_eval, member_expression_eval, - new_expression_eval, + compiled_expression_eval, call_expression_eval, compiled_expression_eval, function_expression_eval,

1 0

Jacek Caban : jscript: Added bytecode-based version of identifier expression.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: bd80daff96ceb68241f9cdbf213eadbbe88bc1d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd80daff96ceb68241f9cdbf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 12:08:54 2011 +0100 jscript: Added bytecode-based version of identifier expression. --- dlls/jscript/compile.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 22 +++++++++++++++++++++ dlls/jscript/engine.h | 7 ++++++ 3 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 492ca3c..3ee3d40 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -53,6 +53,31 @@ static WCHAR *compiler_alloc_string(bytecode_t *code, const WCHAR *str) return ret; } +static BSTR compiler_alloc_bstr(compiler_ctx_t *ctx, const WCHAR *str) +{ + if(!ctx->code->bstr_pool_size) { + ctx->code->bstr_pool = heap_alloc(8 * sizeof(BSTR)); + if(!ctx->code->bstr_pool) + return NULL; + ctx->code->bstr_pool_size = 8; + }else if(ctx->code->bstr_pool_size == ctx->code->bstr_cnt) { + BSTR *new_pool; + + new_pool = heap_realloc(ctx->code->bstr_pool, ctx->code->bstr_pool_size*2*sizeof(BSTR)); + if(!new_pool) + return NULL; + + ctx->code->bstr_pool = new_pool; + ctx->code->bstr_pool_size *= 2; + } + + ctx->code->bstr_pool[ctx->code->bstr_cnt] = SysAllocString(str); + if(!ctx->code->bstr_pool[ctx->code->bstr_cnt]) + return NULL; + + return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; +} + static unsigned push_instr(compiler_ctx_t *ctx, jsop_t op) { assert(ctx->code_size >= ctx->code_off); @@ -112,6 +137,23 @@ static HRESULT push_instr_str(compiler_ctx_t *ctx, jsop_t op, const WCHAR *arg) return S_OK; } +static HRESULT push_instr_bstr(compiler_ctx_t *ctx, jsop_t op, const WCHAR *arg) +{ + unsigned instr; + WCHAR *str; + + str = compiler_alloc_bstr(ctx, arg); + if(!str) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.bstr = str; + return S_OK; +} + static HRESULT push_instr_double(compiler_ctx_t *ctx, jsop_t op, double arg) { unsigned instr; @@ -312,6 +354,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_IDENT: + return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); case EXPR_LITERAL: @@ -346,7 +390,13 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) void release_bytecode(bytecode_t *code) { + unsigned i; + + for(i=0; i < code->bstr_cnt; i++) + SysFreeString(code->bstr_pool[i]); + jsheap_free(&code->heap); + heap_free(code->bstr_pool); heap_free(code->instrs); heap_free(code); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7e78c83..273281e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1738,6 +1738,28 @@ HRESULT identifier_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return hres; } +/* ECMA-262 3rd Edition 10.1.4 */ +static HRESULT interp_ident(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + exprval_t exprval; + VARIANT v; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = identifier_eval(ctx->parser->script, arg, 0, &ctx->ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, &ctx->ei, &v); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + /* ECMA-262 3rd Edition 7.8.1 */ HRESULT interp_null(exec_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c5681f7..807bb8a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -48,6 +48,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(ident, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ @@ -78,6 +79,7 @@ OP_LIST typedef union { expression_t *expr; + BSTR bstr; double *dbl; LONG lng; WCHAR *str; @@ -87,6 +89,7 @@ typedef union { typedef enum { ARG_NONE = 0, ARG_ADDR, + ARG_BSTR, ARG_EXPR, ARG_INT, ARG_STR @@ -101,6 +104,10 @@ typedef struct { typedef struct { instr_t *instrs; jsheap_t heap; + + BSTR *bstr_pool; + unsigned bstr_pool_size; + unsigned bstr_cnt; } bytecode_t; void release_bytecode(bytecode_t*);

1 0

Jacek Caban : jscript: Use bytecode for conditional expressions.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 25e58de5961303ee9a8bbd43bec2219648d21b18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e58de5961303ee9a8bbd43b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 12:04:51 2011 +0100 jscript: Use bytecode for conditional expressions. --- dlls/jscript/compile.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.c | 32 ++++++++++---------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 6abeec4..5c830d2 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -193,6 +193,40 @@ static HRESULT compile_logical_expression(compiler_ctx_t *ctx, binary_expression return S_OK; } +/* ECMA-262 3rd Edition 11.12 */ +static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_expression_t *expr) +{ + unsigned jmp_false, jmp_end; + HRESULT hres; + + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + jmp_false = push_instr(ctx, OP_jmp_z); + if(jmp_false == -1) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, expr->true_expression); + if(FAILED(hres)) + return hres; + + jmp_end = push_instr(ctx, OP_jmp); + if(jmp_end == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, jmp_false)->arg1.uint = ctx->code_off; + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, expr->false_expression); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, jmp_end)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -252,6 +286,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_COMMA: return compile_comma_expression(ctx, (binary_expression_t*)expr); + case EXPR_COND: + return compile_conditional_expression(ctx, (conditional_expression_t*)expr); case EXPR_EQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bf35d8a..9244eff 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1435,28 +1435,6 @@ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD f return S_OK; } -/* ECMA-262 3rd Edition 11.12 */ -HRESULT conditional_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - conditional_expression_t *expr = (conditional_expression_t*)_expr; - exprval_t exprval; - VARIANT_BOOL b; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_boolean(ctx, &exprval, ei, &b); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - return expr_eval(ctx, b ? expr->true_expression : expr->false_expression, flags, ei, ret); -} - /* ECMA-262 3rd Edition 11.2.1 */ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -3291,6 +3269,16 @@ HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret); } +HRESULT interp_jmp(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + + TRACE("\n"); + + ctx->ip = arg; + return S_OK; +} + static HRESULT interp_pop(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5b67413..a92b942 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -50,6 +50,7 @@ typedef struct _func_stack { X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ + X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ X(minus, 1, 0,0) \ @@ -535,7 +536,6 @@ typedef struct { } property_value_expression_t; HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT conditional_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 08e7b33..a3c54ad 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1352,7 +1352,7 @@ static const expression_eval_t expression_eval_table[] = { assign_and_expression_eval, assign_or_expression_eval, assign_xor_expression_eval, - conditional_expression_eval, + compiled_expression_eval, array_expression_eval, member_expression_eval, new_expression_eval,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 991fcc17bfeabe5a4ba51dd3517d7508d1a3eacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=991fcc17bfeabe5a4ba51dd35… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Oct 31 20:16:19 2011 +0200 po: Update Lithuanian translation. --- po/lt.po | 64 +++++++++++++++++++++++-------------------------------------- 1 files changed, 24 insertions(+), 40 deletions(-) diff --git a/po/lt.po b/po/lt.po index 59a7952..8c826b6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-07 22:04+0300\n" +"PO-Revision-Date: 2011-11-26 17:27+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -383,13 +383,12 @@ msgid "Unreadable Entry" msgstr "Neperskaitomas įrašas" #: comdlg32.rc:68 -#, fuzzy msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" "Ši reikšmė nepatenka į puslapių rėžį.\n" -"Prašome įvesti reikšmę tarp %d ir %d." +"Prašome įvesti reikšmę tarp %1!d! ir %2!d!." #: comdlg32.rc:70 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -449,9 +448,8 @@ msgstr "" "Prašome įdiegti spausdintuvą ir pakartoti." #: comdlg32.rc:151 -#, fuzzy msgid "Select a font size between %1!d! and %2!d! points." -msgstr "Pasirinkite šrifto dydį tarp %d ir %d taškų." +msgstr "Pasirinkite šrifto dydį tarp %1!d! ir %2!d! taškų." #: comdlg32.rc:152 ieframe.rc:32 msgid "&Save" @@ -1646,9 +1644,8 @@ msgid "Public key" msgstr "Viešasis raktas" #: cryptui.rc:58 -#, fuzzy msgid "%1 (%2!d! bits)" -msgstr "%s (%d bitai)" +msgstr "%1 (%2!d! bitai)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2097,9 +2094,8 @@ msgid "Regional Setting" msgstr "Regiono nuostatos" #: dxdiagn.rc:26 -#, fuzzy msgid "%1!u!MB used, %2!u!MB available" -msgstr "%u MB sunaudota, %u MB laisva" +msgstr "%1!u! MB sunaudota, %2!u!MB MB laisva" #: gdi32.rc:25 msgid "Western" @@ -6254,9 +6250,8 @@ msgid "us" msgstr "µs" #: setupapi.rc:28 -#, fuzzy msgid "The file '%1' on %2 is needed" -msgstr "Reikalingas failas „%s“ esantis %s" +msgstr "Reikalingas failas „%1“ esantis %2" #: setupapi.rc:29 ipconfig.rc:31 msgid "Unknown" @@ -8928,9 +8923,8 @@ msgstr "" "Klaida: nurodytas nežinomas arba netinkamas komandinės eilutės parametras\n" #: ipconfig.rc:29 -#, fuzzy msgid "%1 adapter %2\n" -msgstr "%s adapteris %s\n" +msgstr "%1 adapteris %2\n" #: ipconfig.rc:30 msgid "Ethernet" @@ -9318,7 +9312,6 @@ msgid "Unicode (UTF-8)" msgstr "Unikodas (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9327,10 +9320,10 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" -"Šiame faile yra unikodo ženklų, kurie bus prarasti, jei išsaugosite failą %s " -"koduotėje.\n" -"Norėdami išsaugoti šiuos ženklus, spauskite „Atsisakyti“ ir pasirinkite " +"%1\n" +"Šiame faile yra unikodo ženklų, kurie bus prarasti,\n" +"jei išsaugosite failą %2 koduotėje.\n" +"Norėdami išsaugoti šiuos ženklus, spauskite „Atsisakyti“ ir pasirinkite\n" "vieną iš unikodo nuostatų koduotės išskleidžiamajame sąraše.\n" "Tęsti?" @@ -9664,9 +9657,8 @@ msgid "bytes" msgstr "baitai" #: oleview.rc:148 -#, fuzzy msgid "LoadTypeLib( %1 ) failed ($%2!x!)" -msgstr "LoadTypeLib( %s ) nepavyko ($%x)" +msgstr "LoadTypeLib( %1 ) nepavyko ($%2!x!)" #: oleview.rc:149 msgid "Inherited Interfaces" @@ -10428,52 +10420,45 @@ msgid "Error: One of options /im or /pid must be specified.\n" msgstr "Klaida: viena iš parinkčių /im arba /pid privalo būti nurodyta.\n" #: taskkill.rc:31 -#, fuzzy msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Klaida: parinkčiai %s reikalingas komandos eilutės parametras.\n" +msgstr "Klaida: parinkčiai %1 reikalingas komandos eilutės parametras.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" msgstr "Klaida: parinktys /im ir /pid yra nesuderinamos.\n" #: taskkill.rc:33 -#, fuzzy msgid "Close message sent to top-level windows of process with PID %1!u!.\n" msgstr "" -"Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso, kurio PID %u, " +"Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso, kurio PID %1!u!, " "langams.\n" #: taskkill.rc:34 -#, fuzzy msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso „%s“, kurio PID " -"%u, langams.\n" +"Užvėrimo pranešimas nusiųstas aukščiausiojo lygio proceso „%1“, kurio PID %2!" +"u!, langams.\n" #: taskkill.rc:35 -#, fuzzy msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Procesas, kurio PID %u, buvo priverstinai nutrauktas.\n" +msgstr "Procesas, kurio PID %1!u!, buvo priverstinai nutrauktas.\n" #: taskkill.rc:36 -#, fuzzy msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "Procesas „%s“, kurio PID %u, buvo priverstinai nutrauktas.\n" +msgstr "Procesas „%1“, kurio PID %2!u!, buvo priverstinai nutrauktas.\n" #: taskkill.rc:37 -#, fuzzy msgid "Error: Could not find process \"%1\".\n" -msgstr "Klaida: nepavyko rasti proceso „%s“.\n" +msgstr "Klaida: nepavyko rasti proceso „%1“.\n" #: taskkill.rc:38 msgid "Error: Unable to enumerate the process list.\n" msgstr "Klaida: nepavyko gauti procesų sąrašo.\n" #: taskkill.rc:39 -#, fuzzy msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "Klaida: nepavyko nutraukti proceso „%s“.\n" +msgstr "Klaida: nepavyko nutraukti proceso „%1“.\n" #: taskkill.rc:40 msgid "Error: Process self-termination is not permitted.\n" @@ -11144,9 +11129,8 @@ msgid "Processes: %d" msgstr "Procesai: %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Atminties naudojimas: %dK / %dK" +msgstr "Atminties naudojimas: %1!u! kB / %2!u! kB" #: taskmgr.rc:272 msgid "Image Name" @@ -12471,17 +12455,17 @@ msgstr "%1 iš %2 laisva" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "kB" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "MB" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "GB" #: winemine.rc:34 msgid "&Game"

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 7d5861f6d8ec9014c2f71782bcfb5ba9a24085fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5861f6d8ec9014c2f71782b… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Sun Nov 27 21:39:23 2011 +0900 po: Updated Korean translation. --- po/ko.po | 56 ++++++++++++++++++++------------------------------------ 1 files changed, 20 insertions(+), 36 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0f9a40d..9aaffe2 100644 --- a/po/ko.po +++ b/po/ko.po @@ -381,13 +381,12 @@ msgid "Unreadable Entry" msgstr "입력을 읽을 수 없습니다" #: comdlg32.rc:68 -#, fuzzy msgid "" "This value does not lie within the page range.\n" "Please enter a value between %1!d! and %2!d!." msgstr "" "페이지 범위를 벗어나지 않아야 올바른 값입니다.\n" -"%d 과 %d 사이의 값을 입력하시오 " +"%1!d! 과 %2!d! 사이의 값을 입력하시오 " #: comdlg32.rc:70 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -446,9 +445,8 @@ msgstr "" "은 먼저 프린터를 설치하시오. 설치하고 다시 시도하시오." #: comdlg32.rc:151 -#, fuzzy msgid "Select a font size between %1!d! and %2!d! points." -msgstr "%d 와 %d 포인트 사이에서 글꼴 크기 선택." +msgstr "%1!d! 와 %2!d! 포인트 사이에서 글꼴 크기 선택하십시오." #: comdlg32.rc:152 ieframe.rc:32 msgid "&Save" @@ -1640,9 +1638,8 @@ msgid "Public key" msgstr "공용 키" #: cryptui.rc:58 -#, fuzzy msgid "%1 (%2!d! bits)" -msgstr "%s (%d 비트)" +msgstr "%1 (%2!d! 비트)" #: cryptui.rc:59 msgid "SHA1 hash" @@ -2088,13 +2085,12 @@ msgid "Regional Setting" msgstr "지역 설정" #: dxdiagn.rc:26 -#, fuzzy msgid "%1!u!MB used, %2!u!MB available" -msgstr "%uMB 사용됨, %uMB 사용 가능함" +msgstr "%1!u!메가바이트 사용됨, %2!u!메가바이 사용 가능함" #: gdi32.rc:25 msgid "Western" -msgstr "서" +msgstr "서부" #: gdi32.rc:26 msgid "Central European" @@ -6236,9 +6232,8 @@ msgid "us" msgstr "마이크로초" #: setupapi.rc:28 -#, fuzzy msgid "The file '%1' on %2 is needed" -msgstr "이 파일 '%s' 은 %s에서 필요로 합니다" +msgstr "이 파일 '%1' 은 %2에서 필요로 합니다" #: setupapi.rc:29 ipconfig.rc:31 msgid "Unknown" @@ -8877,9 +8872,8 @@ msgid "Error: Unknown or invalid command line parameters specified\n" msgstr "오류: 알수 없거나 올바르지 않은 명령어 라인 매개변수가 지정됨\n" #: ipconfig.rc:29 -#, fuzzy msgid "%1 adapter %2\n" -msgstr "%s 어댑터 %s\n" +msgstr "%1 어댑터 %2\n" #: ipconfig.rc:30 msgid "Ethernet" @@ -9266,7 +9260,6 @@ msgid "Unicode (UTF-8)" msgstr "유니코드 (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9276,7 +9269,7 @@ msgid "" "Continue?" msgstr "" "%s\n" -"유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %s 인코딩으로\n" +"유니코드 문자를 포함하고 있는 이 파일은 만약 당신이 %2 인코딩으로\n" "파일을 저장하면 문자의 손실이 있을 것입니다.\n" "이 문자를 보존하려면 취소를 클릭하고, 인코딩 드롭다운목록의 유니코드\n" "옵션 중의 하나를 선택하십시오t.\n" @@ -9612,9 +9605,8 @@ msgid "bytes" msgstr "바이트" #: oleview.rc:148 -#, fuzzy msgid "LoadTypeLib( %1 ) failed ($%2!x!)" -msgstr "LoadTypeLib( %s ) 실패 ($%x)" +msgstr "LoadTypeLib( %1 ) 실패 ($%2!x!)" #: oleview.rc:149 msgid "Inherited Interfaces" @@ -10366,49 +10358,42 @@ msgid "Error: One of options /im or /pid must be specified.\n" msgstr "오류: /im 니 /pid 옵션중의 하나는 반드시 지정되어야합니다.\n" #: taskkill.rc:31 -#, fuzzy msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "오류: 롭션 %s 는 하나의 명령어라인 매개변수가 올것으로 예상합니다.\n" +msgstr "오류: 롭션 %1 는 하나의 명령어라인 매개변수가 올것으로 예상합니다.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" msgstr "오류: /im 와 /pid 옵션은 같이 사용할 수 없습니다.\n" #: taskkill.rc:33 -#, fuzzy msgid "Close message sent to top-level windows of process with PID %1!u!.\n" -msgstr "PID %u 의 프로세스의 최상위 창에 닫는 메세지 보냈습니다.\n" +msgstr "PID %1!u! 의 프로세스의 최상위 창에 닫는 메세지 보냈습니다.\n" #: taskkill.rc:34 -#, fuzzy msgid "" "Close message sent to top-level windows of process \"%1\" with PID %2!u!.\n" msgstr "" -"PID %u 의 프로세스 \"%s\"의 최상위 창에 닫으라는 메세지를 보냈습니다.\n" +"PID %2!u! 의 프로세스 \"%1\"의 최상위 창에 닫으라는 메세지를 보냈습니다.\n" #: taskkill.rc:35 -#, fuzzy msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "PID %u 의 프로세스는 강제로 종료되었습니다.\n" +msgstr "PID %1!u! 의 프로세스는 강제로 종료되었습니다.\n" #: taskkill.rc:36 -#, fuzzy msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "PID %u 의 프로세스 \"%s\" 는 강제로 종료되엇습니다.\n" +msgstr "PID %2!u! 의 프로세스 \"%1\" 는 강제로 종료되엇습니다.\n" #: taskkill.rc:37 -#, fuzzy msgid "Error: Could not find process \"%1\".\n" -msgstr "오류: 프로세스 \"%s\"를 찾을 수 없습니다.\n" +msgstr "오류: 프로세스 \"%1\"를 찾을 수 없습니다.\n" #: taskkill.rc:38 msgid "Error: Unable to enumerate the process list.\n" msgstr "오류: 프로세스 목록을 열거 할 수 없습니다.\n" #: taskkill.rc:39 -#, fuzzy msgid "Error: Unable to terminate process \"%1\".\n" -msgstr "오류: \"%s\" 프로세스를 중단시킬 수 없습니다.\n" +msgstr "오류: \"%1\" 프로세스를 중단시킬 수 없습니다.\n" #: taskkill.rc:40 msgid "Error: Process self-termination is not permitted.\n" @@ -11070,9 +11055,8 @@ msgid "Processes: %d" msgstr "프로세스: %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "메모리 사용량: %dK / %dK" +msgstr "메모리 사용량: %1!u!킬로바이트 / %2!u!킬로바이트" #: taskmgr.rc:272 msgid "Image Name" @@ -12396,17 +12380,17 @@ msgstr "%1 의 %2 사용가능" #: winefile.rc:121 msgctxt "unit kilobyte" msgid "kB" -msgstr "" +msgstr "킬로바이트" #: winefile.rc:122 msgctxt "unit megabyte" msgid "MB" -msgstr "" +msgstr "메가바이트" #: winefile.rc:123 msgctxt "unit gigabyte" msgid "GB" -msgstr "" +msgstr "기가바이트" #: winemine.rc:34 msgid "&Game"

1 0

Jacek Caban : jscript: Use bytecode for logical or expression.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 28375af386aec7c5aa01344ce0dac3124fc8bc47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28375af386aec7c5aa01344ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 12:03:57 2011 +0100 jscript: Use bytecode for logical or expression. --- dlls/jscript/compile.c | 24 ++++++++++++++++++++++++ dlls/jscript/engine.c | 44 +++++++++++++------------------------------- dlls/jscript/engine.h | 7 +++++-- dlls/jscript/parser.y | 2 +- 4 files changed, 43 insertions(+), 34 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 65d6861..36ecb6a 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -171,6 +171,28 @@ static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t return compile_expression(ctx, expr->expression2); } +/* ECMA-262 3rd Edition 11.11 */ +static HRESULT compile_logical_expression(compiler_ctx_t *ctx, binary_expression_t *expr, jsop_t op) +{ + unsigned instr; + HRESULT hres; + + hres = compile_expression(ctx, expr->expression1); + if(FAILED(hres)) + return hres; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + hres = compile_expression(ctx, expr->expression2); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, instr)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -244,6 +266,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq); case EXPR_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); + case EXPR_OR: + return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_nz); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); case EXPR_SUB: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9e26e93..0cecd92 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -94,6 +94,11 @@ static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) return stack_push(ctx, &v); } +static inline VARIANT *stack_top(exec_ctx_t *ctx) +{ + return ctx->stack + ctx->top-1; +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -1930,47 +1935,24 @@ HRESULT property_value_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.11 */ -HRESULT logical_or_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_jmp_nz(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - exprval_t exprval; + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; - VARIANT val; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_boolean(&val, &b); - if(SUCCEEDED(hres) && b) { - ret->type = EXPRVAL_VARIANT; - ret->u.var = val; - return S_OK; + if(b) { + ctx->ip = arg; + }else { + stack_popn(ctx, 1); + ctx->ip++; } - - VariantClear(&val); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = val; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d74d57c..27083aa 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -50,6 +50,7 @@ typedef struct _func_stack { X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ + X(jmp_nz, 0, ARG_ADDR, 0) \ X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ @@ -77,12 +78,15 @@ typedef union { double *dbl; LONG lng; WCHAR *str; + unsigned uint; } instr_arg_t; typedef enum { ARG_NONE = 0, + ARG_ADDR, ARG_EXPR, - ARG_INT + ARG_INT, + ARG_STR } instr_arg_type_t; typedef struct { @@ -539,7 +543,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT logical_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT logical_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3c953eb..7e9febc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1306,7 +1306,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, - logical_or_expression_eval, + compiled_expression_eval, logical_and_expression_eval, binary_or_expression_eval, binary_xor_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for logical and expression.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 88dc54a7f7f9951b35a7f8c1218ccd9b2247cb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dc54a7f7f9951b35a7f8c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 12:04:33 2011 +0100 jscript: Use bytecode for logical and expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 39 ++++++++------------------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 36ecb6a..6abeec4 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -244,6 +244,8 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_AND: + return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); case EXPR_ADD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0cecd92..bf35d8a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1957,47 +1957,24 @@ HRESULT interp_jmp_nz(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.11 */ -HRESULT logical_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_jmp_z(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - exprval_t exprval; + const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; VARIANT_BOOL b; - VARIANT val; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; - hres = to_boolean(&val, &b); - if(SUCCEEDED(hres) && !b) { - ret->type = EXPRVAL_VARIANT; - ret->u.var = val; - return S_OK; + if(b) { + stack_popn(ctx, 1); + ctx->ip++; + }else { + ctx->ip = arg; } - - VariantClear(&val); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = val; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 27083aa..5b67413 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -51,6 +51,7 @@ typedef struct _func_stack { X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ + X(jmp_z, 0, ARG_ADDR, 0) \ X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ @@ -543,7 +544,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT logical_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7e9febc..08e7b33 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1307,7 +1307,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, - logical_and_expression_eval, + compiled_expression_eval, binary_or_expression_eval, binary_xor_expression_eval, binary_and_expression_eval,

1 0

Nikolay Sivov : msxml3: Some refcount tests to show details of internal DOM representation.
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: 5afb829fdc41ec3d5c6ed9605ca5532f0b89b082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afb829fdc41ec3d5c6ed9605… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 26 16:41:39 2011 +0300 msxml3: Some refcount tests to show details of internal DOM representation. --- dlls/msxml3/tests/domdoc.c | 275 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 247 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5afb829fdc41ec3d5c6ed…

1 0

Nikolay Sivov : msxml3: Use common helper for IXMLDOMText_get_nodeValue().
by Alexandre Julliard 28 Nov '11

28 Nov '11

Module: wine Branch: master Commit: a1d9fa11d345036ecd9f2381b00f40e2f5280d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d9fa11d345036ecd9f2381b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 27 20:24:52 2011 +0300 msxml3: Use common helper for IXMLDOMText_get_nodeValue(). --- dlls/msxml3/text.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 6540773..abf11b3 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -171,12 +171,7 @@ static HRESULT WINAPI domtext_get_nodeValue( TRACE("(%p)->(%p)\n", This, value); - if(!value) - return E_INVALIDARG; - - V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar(This->node.node->content); - return S_OK; + return node_get_content(&This->node, value); } static HRESULT WINAPI domtext_put_nodeValue(

1 0