November 2011 - Wine-commits

Piotr Caban : msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 1c04cbfd336cc8867162468c8027f31492938a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c04cbfd336cc8867162468c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:30 2011 +0100 msvcp90: Reorganize __ASM_EXCEPTION_VTABLE macro. --- dlls/msvcp90/exception.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 00fb0f0..77e1e60 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -64,20 +64,12 @@ void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); #ifdef _WIN64 -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.quad " THISCALL_NAME(what_func) ) #else -#define __ASM_EXCEPTION_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_what_exception) ) - -#define __ASM_EXCEPTION_STRING_VTABLE(name) \ - __ASM_VTABLE(name, "\t.long " THISCALL_NAME(MSVCP_logic_error_what) ) - +#define __ASM_EXCEPTION_VTABLE(name, what_func) \ + __ASM_VTABLE(name, "\t.long " THISCALL_NAME(what_func) ) #endif /* _WIN64 */ extern const vtable_ptr MSVCP_bad_alloc_vtable; @@ -688,11 +680,11 @@ static const cxx_exception_type invalid_argument_cxx_type = { #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif - __ASM_EXCEPTION_VTABLE(bad_alloc); - __ASM_EXCEPTION_STRING_VTABLE(logic_error); - __ASM_EXCEPTION_STRING_VTABLE(length_error); - __ASM_EXCEPTION_STRING_VTABLE(out_of_range); - __ASM_EXCEPTION_STRING_VTABLE(invalid_argument); + __ASM_EXCEPTION_VTABLE(bad_alloc, MSVCP_what_exception); + __ASM_EXCEPTION_VTABLE(logic_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); #ifndef __GNUC__ } #endif

1 0

Piotr Caban : msvcp90: Added runtime_exception implementation.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 400c887e857e86f3155c293a2d0293479b527c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=400c887e857e86f3155c293a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 25 10:46:48 2011 +0100 msvcp90: Added runtime_exception implementation. --- dlls/msvcp90/exception.c | 136 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcp90/msvcp90.h | 3 +- 2 files changed, 134 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 77e1e60..0008f43 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -77,6 +77,7 @@ extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; +extern const vtable_ptr MSVCP_runtime_error_vtable; /* exception class data */ static type_info exception_type_info = { @@ -677,6 +678,131 @@ static const cxx_exception_type invalid_argument_cxx_type = { &invalid_argument_cxx_type_table }; +/* runtime_error class data */ +typedef struct { + exception e; + basic_string_char str; +} runtime_error; + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_ctor, 8) +runtime_error* __thiscall MSVCP_runtime_error_ctor( + runtime_error *this, const char **name) +{ + TRACE("%p %s\n", this, *name); + this->e.vtable = &MSVCP_runtime_error_vtable; + this->e.name = NULL; + this->e.do_free = FALSE; + MSVCP_basic_string_char_ctor_cstr(&this->str, *name); + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_copy_ctor, 8) +runtime_error* __thiscall MSVCP_runtime_error_copy_ctor( + runtime_error *this, runtime_error *rhs) +{ + TRACE("%p %p\n", this, rhs); + MSVCP_exception_copy_ctor(&this->e, &rhs->e); + MSVCP_basic_string_char_copy_ctor(&this->str, &rhs->str); + this->e.vtable = &MSVCP_runtime_error_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_dtor, 4) +void __thiscall MSVCP_runtime_error_dtor(runtime_error *this) +{ + TRACE("%p\n", this); + MSVCP_exception_dtor(&this->e); + MSVCP_basic_string_char_dtor(&this->str); +} + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_vector_dtor, 8) +void* __thiscall MSVCP_runtime_error_vector_dtor( + runtime_error *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_runtime_error_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_runtime_error_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +static const type_info runtime_error_type_info = { + &MSVCP_runtime_error_vtable, + NULL, + ".?AVruntime_error(a)std@@" +}; + +static const rtti_base_descriptor runtime_error_rtti_base_descriptor = { + &runtime_error_type_info, + 1, + { 0, -1, 0 }, + 64 +}; + +static const rtti_base_array runtime_error_rtti_base_array = { + { + &runtime_error_rtti_base_descriptor, + &exception_rtti_base_descriptor, + NULL + } +}; + +static const rtti_object_hierarchy runtime_error_type_hierarchy = { + 0, + 0, + 2, + &runtime_error_rtti_base_array +}; + +const rtti_object_locator runtime_error_rtti = { + 0, + 0, + 0, + &runtime_error_type_info, + &runtime_error_type_hierarchy +}; + +static const cxx_type_info runtime_error_cxx_type_info = { + 0, + &runtime_error_type_info, + { 0, -1, 0 }, + sizeof(runtime_error), + (cxx_copy_ctor)THISCALL(MSVCP_runtime_error_copy_ctor) +}; + +static const cxx_type_info_table runtime_error_cxx_type_table = { + 2, + { + &runtime_error_cxx_type_info, + &exception_cxx_type_info, + NULL + } +}; + +static const cxx_exception_type runtime_error_cxx_type = { + 0, + (cxx_copy_ctor)THISCALL(MSVCP_runtime_error_dtor), + NULL, + &runtime_error_cxx_type_table +}; + +DEFINE_THISCALL_WRAPPER(MSVCP_runtime_error_what, 4) +const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) +{ + TRACE("%p\n", this); + return MSVCP_basic_string_char_c_str(&this->str); +} + #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif @@ -685,6 +811,7 @@ void __asm_dummy_vtables(void) { __ASM_EXCEPTION_VTABLE(length_error, MSVCP_logic_error_what); __ASM_EXCEPTION_VTABLE(out_of_range, MSVCP_logic_error_what); __ASM_EXCEPTION_VTABLE(invalid_argument, MSVCP_logic_error_what); + __ASM_EXCEPTION_VTABLE(runtime_error, MSVCP_runtime_error_what); #ifndef __GNUC__ } #endif @@ -699,25 +826,21 @@ void throw_exception(exception_type et, const char *str) exception e; MSVCP_exception_ctor(&e, &addr); _CxxThrowException(&e, &exception_cxx_type); - return; } case EXCEPTION_BAD_ALLOC: { bad_alloc e; MSVCP_bad_alloc_ctor(&e, &addr); _CxxThrowException(&e, &bad_alloc_cxx_type); - return; } case EXCEPTION_LOGIC_ERROR: { logic_error e; MSVCP_logic_error_ctor(&e, &addr); _CxxThrowException((exception*)&e, &logic_error_cxx_type); - return; } case EXCEPTION_LENGTH_ERROR: { length_error e; MSVCP_length_error_ctor(&e, &addr); _CxxThrowException((exception*)&e, &length_error_cxx_type); - return; } case EXCEPTION_OUT_OF_RANGE: { out_of_range e; @@ -729,5 +852,10 @@ void throw_exception(exception_type et, const char *str) MSVCP_invalid_argument_ctor(&e, &addr); _CxxThrowException((exception*)&e, &invalid_argument_cxx_type); } + case EXCEPTION_RUNTIME_ERROR: { + runtime_error e; + MSVCP_runtime_error_ctor(&e, &addr); + _CxxThrowException((exception*)&e, &runtime_error_cxx_type); + } } } diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index cb2a9b8..72e5d11 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -104,7 +104,8 @@ typedef enum __exception_type { EXCEPTION_LOGIC_ERROR, EXCEPTION_LENGTH_ERROR, EXCEPTION_OUT_OF_RANGE, - EXCEPTION_INVALID_ARGUMENT + EXCEPTION_INVALID_ARGUMENT, + EXCEPTION_RUNTIME_ERROR } exception_type; void throw_exception(exception_type, const char *); void set_exception_vtable(void);

1 0

Jacek Caban : jscript: Fixed memory leaks.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 172fa4fa99873bb1a98e658c3cdba950044f0eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=172fa4fa99873bb1a98e658c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:05:31 2011 +0100 jscript: Fixed memory leaks. Spotted by Piotr. --- dlls/jscript/engine.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3d9858d..e706407 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2290,6 +2290,8 @@ HRESULT interp_add(exec_ctx_t *ctx) TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r)); hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; @@ -3362,6 +3364,7 @@ static HRESULT interp_tree(exec_ctx_t *ctx) return hres; hres = exprval_to_value(ctx->parser->script, &val, &ctx->ei, &v); + exprval_release(&val); if(FAILED(hres)) return hres;

1 0

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

25 Nov '11

Module: wine Branch: master Commit: 47314a92d7c1d46739108ba21994ea3c2abba9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=47314a92d7c1d46739108ba21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:05:50 2011 +0100 jscript: Use bytecode for comma expression implementation. --- dlls/jscript/compile.c | 17 +++++++++++++++++ dlls/jscript/engine.c | 28 ++++++++-------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4b5b91b..77391bd 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -156,6 +156,21 @@ static HRESULT compile_unary_expression(compiler_ctx_t *ctx, unary_expression_t return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +/* ECMA-262 3rd Edition 11.14 */ +static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->expression1); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + return compile_expression(ctx, expr->expression2); +} + static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) { unsigned instr; @@ -211,6 +226,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BITNEG: 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_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e706407..87f873c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1910,26 +1910,6 @@ HRESULT property_value_expression_eval(script_ctx_t *ctx, expression_t *_expr, D return S_OK; } -/* ECMA-262 3rd Edition 11.14 */ -HRESULT comma_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT lval, rval; - HRESULT hres; - - TRACE("\n"); - - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; - - VariantClear(&lval); - - ret->type = EXPRVAL_VARIANT; - ret->u.var = rval; - return S_OK; -} - /* 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) { @@ -3342,6 +3322,14 @@ 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); } +static HRESULT interp_pop(exec_ctx_t *ctx) +{ + TRACE("\n"); + + stack_popn(ctx, 1); + return S_OK; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c42b2e8..a713e02 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -52,6 +52,7 @@ typedef struct _func_stack { X(neg, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ + X(pop, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ @@ -534,7 +535,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 comma_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f051c0c..d8daa59 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1305,7 +1305,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide } static const expression_eval_t expression_eval_table[] = { - comma_expression_eval, + compiled_expression_eval, logical_or_expression_eval, logical_and_expression_eval, binary_or_expression_eval,

1 0

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

25 Nov '11

Module: wine Branch: master Commit: b13c6a27c3113e898989063416512a35b56831e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b13c6a27c3113e89898906341… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:06:05 2011 +0100 jscript: Use bytecode for '-' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 34 +++++++++++++++++++++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 77391bd..12dd04f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -240,6 +240,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum); + case EXPR_SUB: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; case EXPR_VOID: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 87f873c..a004326 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -86,6 +86,14 @@ static HRESULT stack_push_bool(exec_ctx_t *ctx, BOOL b) return stack_push(ctx, &v); } +static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) +{ + VARIANT v; + + num_set_val(&v, number); + return stack_push(ctx, &v); +} + static inline VARIANT *stack_pop(exec_ctx_t *ctx) { assert(ctx->top); @@ -98,6 +106,17 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) +{ + VARIANT *v; + HRESULT hres; + + v = stack_pop(ctx); + hres = to_number(ctx->parser->script, v, &ctx->ei, r); + VariantClear(v); + return hres; +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -2297,13 +2316,22 @@ static HRESULT sub_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.6.2 */ -HRESULT sub_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_sub(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, sub_eval, ei, ret); + hres = stack_pop_number(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_number(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_number(ctx, num_val(&l)-num_val(&r)); } /* ECMA-262 3rd Edition 11.5.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a713e02..736fe5a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -59,6 +59,7 @@ typedef struct _func_stack { X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) \ + X(sub, 1, 0,0) \ X(void, 1, 0,0) typedef enum { @@ -541,7 +542,6 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, 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; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mod_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 d8daa59..2e8c0d8 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1314,7 +1314,7 @@ static const expression_eval_t expression_eval_table[] = { instanceof_expression_eval, compiled_expression_eval, compiled_expression_eval, - sub_expression_eval, + compiled_expression_eval, mul_expression_eval, div_expression_eval, mod_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for unary '-' expression.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 413fe9a46200f9477d1b6bf2ba7a55b4f76b0760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=413fe9a46200f9477d1b6bf2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:06:30 2011 +0100 jscript: Use bytecode for unary '-' expression. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 22 ++++------------------ dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 12dd04f..17c949b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -236,6 +236,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: 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_NOTEQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2); case EXPR_PLUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a004326..c4889f5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2574,32 +2574,18 @@ HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.7 */ -HRESULT minus_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_minus(exec_ctx_t *ctx) { - unary_expression_t *expr = (unary_expression_t*)_expr; - exprval_t exprval; - VARIANT val, num; + VARIANT n; HRESULT hres; TRACE("\n"); - hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); + hres = stack_pop_number(ctx, &n); if(FAILED(hres)) return hres; - hres = exprval_to_value(ctx, &exprval, ei, &val); - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, &val, ei, &num); - VariantClear(&val); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - num_set_val(&ret->u.var, -num_val(&num)); - return S_OK; + return stack_push_number(ctx, -num_val(&n)); } /* ECMA-262 3rd Edition 11.4.6 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 736fe5a..dd31909 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -49,6 +49,7 @@ typedef struct _func_stack { X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ + X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2e8c0d8..3e7f0fe 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1321,7 +1321,7 @@ static const expression_eval_t expression_eval_table[] = { delete_expression_eval, compiled_expression_eval, typeof_expression_eval, - minus_expression_eval, + compiled_expression_eval, compiled_expression_eval, post_increment_expression_eval, post_decrement_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '==' and '!=' expression.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 58952a07d045cecacd12f222da0be49f8748528b URL: http://source.winehq.org/git/wine.git/?a=commit;h=58952a07d045cecacd12f222d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 25 12:07:30 2011 +0100 jscript: Use bytecode for '==' and '!=' expression. --- dlls/jscript/compile.c | 4 +++ dlls/jscript/engine.c | 52 ++++++++++++++++++++++------------------------- dlls/jscript/engine.h | 4 +- dlls/jscript/parser.y | 4 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 17c949b..65d6861 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -228,6 +228,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_EQ: + 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_IN: @@ -238,6 +240,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_NOTEQ: + 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_PLUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c4889f5..9e26e93 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2842,70 +2842,66 @@ static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.9.1 */ -HRESULT equal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_eq(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &rval, &lval); - if(FAILED(hres)) - return hres; + TRACE("%s == %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = equal_values(ctx, &rval, &lval, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = equal_values(ctx->parser->script, l, r, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } -/* ECMA-262 3rd Edition 11.9.4 */ -static HRESULT interp_eq2(exec_ctx_t *ctx) +/* ECMA-262 3rd Edition 11.9.2 */ +HRESULT interp_neq(exec_ctx_t *ctx) { VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); - r = stack_pop(ctx); l = stack_pop(ctx); - hres = equal2_values(r, l, &b); + TRACE("%s != %s\n", debugstr_variant(l), debugstr_variant(r)); + + hres = equal_values(ctx->parser->script, l, r, &ctx->ei, &b); VariantClear(l); VariantClear(r); if(FAILED(hres)) return hres; - return stack_push_bool(ctx, b); + return stack_push_bool(ctx, !b); } -/* ECMA-262 3rd Edition 11.9.2 */ -HRESULT not_equal_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.9.4 */ +static HRESULT interp_eq2(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; TRACE("\n"); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = equal_values(ctx, &lval, &rval, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = equal2_values(r, l, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, !b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.9.5 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dd31909..d74d57c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -46,11 +46,13 @@ typedef struct _func_stack { X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ + X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(minus, 1, 0,0) \ X(neg, 1, 0,0) \ + X(neq, 1, 0,0) \ X(neq2, 1, 0,0) \ X(null, 1, 0,0) \ X(pop, 1, 0,0) \ @@ -553,8 +555,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT not_equal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_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 3e7f0fe..3c953eb 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1327,9 +1327,9 @@ static const expression_eval_t expression_eval_table[] = { post_decrement_expression_eval, pre_increment_expression_eval, pre_decrement_expression_eval, - equal_expression_eval, compiled_expression_eval, - not_equal_expression_eval, + compiled_expression_eval, + compiled_expression_eval, compiled_expression_eval, less_expression_eval, lesseq_expression_eval,

1 0

Henri Verbeet : wined3d: Don't apply fixups to converted surfaces.
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 24775459c8892b8e92f42ac9a66946f50b0b1190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24775459c8892b8e92f42ac9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:32 2011 +0100 wined3d: Don't apply fixups to converted surfaces. --- dlls/wined3d/arb_program_shader.c | 9 +++++++++ dlls/wined3d/surface.c | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 451d34a..b2fa29c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7137,6 +7137,15 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, GLenum textype = surface->texture_target; const struct wined3d_gl_info *gl_info = context->gl_info; + if (surface->flags & SFLAG_CONVERTED) + { + ENTER_GL(); + glEnable(textype); + checkGLcall("glEnable(textype)"); + LEAVE_GL(); + return WINED3D_OK; + } + if (!is_complex_fixup(surface->resource.format->color_fixup)) { TRACE("Fixup:\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 865f83e..4c9cc84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6229,7 +6229,8 @@ static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, co /* When EXT_PALETTED_TEXTURE is around, palette conversion is done by the GPU * else the surface is converted in software at upload time in LoadLocation. */ - if(fixup == COMPLEX_FIXUP_P8 && context->gl_info->supported[EXT_PALETTED_TEXTURE]) + if (!(surface->flags & SFLAG_CONVERTED) && fixup == COMPLEX_FIXUP_P8 + && context->gl_info->supported[EXT_PALETTED_TEXTURE]) ffp_blit_p8_upload_palette(surface, context->gl_info); ENTER_GL();

1 0

Henri Verbeet : wined3d: Use the correct backbuffer format in wined3d_device_reset().
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: f51bf61d2fa3fc1ba6a9f9da9a365a9c7415b850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51bf61d2fa3fc1ba6a9f9da9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:33 2011 +0100 wined3d: Use the correct backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3737abb..d165806 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5556,7 +5556,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, mode.width = present_parameters->BackBufferWidth; mode.height = present_parameters->BackBufferHeight; mode.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - mode.format_id = swapchain->presentParms.BackBufferFormat; + mode.format_id = present_parameters->BackBufferFormat; } /* Should Width == 800 && Height == 0 set 800x600? */

1 0

Henri Verbeet : wined3d: Handle changing the backbuffer format in wined3d_device_reset().
by Alexandre Julliard 25 Nov '11

25 Nov '11

Module: wine Branch: master Commit: 094f64c823ed65629ebbec78a4b1f5e4583c0142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094f64c823ed65629ebbec78a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 24 22:52:34 2011 +0100 wined3d: Handle changing the backbuffer format in wined3d_device_reset(). --- dlls/wined3d/device.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d165806..e12f48a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5241,6 +5241,8 @@ static HRESULT updateSurfaceDesc(struct wined3d_surface *surface, while (surface->pow2Height < pPresentationParameters->BackBufferHeight) surface->pow2Height <<= 1; } + if (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + surface->resource.format = wined3d_get_format(gl_info, pPresentationParameters->BackBufferFormat); surface->resource.multisample_type = pPresentationParameters->MultiSampleType; surface->resource.multisample_quality = pPresentationParameters->MultiSampleQuality; @@ -5498,10 +5500,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, && present_parameters->BackBufferCount != swapchain->presentParms.BackBufferCount) FIXME("Cannot change the back buffer count yet.\n"); - if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN - && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) - FIXME("Cannot change the back buffer format yet.\n"); - if (present_parameters->hDeviceWindow && present_parameters->hDeviceWindow != swapchain->presentParms.hDeviceWindow) FIXME("Cannot change the device window yet.\n"); @@ -5572,6 +5570,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, update_desc = TRUE; } + if (present_parameters->BackBufferFormat != WINED3DFMT_UNKNOWN + && present_parameters->BackBufferFormat != swapchain->presentParms.BackBufferFormat) + { + swapchain->presentParms.BackBufferFormat = present_parameters->BackBufferFormat; + update_desc = TRUE; + } + if (present_parameters->MultiSampleType != swapchain->presentParms.MultiSampleType || present_parameters->MultiSampleQuality != swapchain->presentParms.MultiSampleQuality) {

1 0