September 2011 - Wine-commits

Jacek Caban : vbscript: Added support for returning value from function.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: f9edb683d260b2175da90e58119aa22ce98a7cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9edb683d260b2175da90e581… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:58:30 2011 +0200 vbscript: Added support for returning value from function. --- dlls/vbscript/interp.c | 29 +++++++++++++++++++++-------- dlls/vbscript/tests/lang.vbs | 17 +++++++++++++++++ dlls/vbscript/vbscript.h | 7 +++++++ 3 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index bb2c282..5c75a14 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -37,6 +37,8 @@ typedef struct { unsigned stack_size; unsigned top; VARIANT *stack; + + VARIANT ret_val; } exec_ctx_t; typedef HRESULT (*instr_func_t)(exec_ctx_t*); @@ -81,7 +83,7 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } -static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) +static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; function_t *func; @@ -89,6 +91,12 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) DISPID id; HRESULT hres; + if(invoke_type == VBDISP_LET && ctx->func->type == FUNC_FUNCTION && !strcmpiW(name, ctx->func->name)) { + ref->type = REF_VAR; + ref->u.v = &ctx->ret_val; + return S_OK; + } + for(i=0; i < ctx->func->var_cnt; i++) { if(!strcmpiW(ctx->func->vars[i].name, name)) { ref->type = REF_VAR; @@ -259,7 +267,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) DISPPARAMS dp; HRESULT hres; - hres = lookup_identifier(ctx, identifier, &ref); + hres = lookup_identifier(ctx, identifier, VBDISP_CALLGET, &ref); if(FAILED(hres)) return hres; @@ -324,7 +332,7 @@ static HRESULT assign_ident(exec_ctx_t *ctx, BSTR name, VARIANT *val, BOOL own_v ref_t ref; HRESULT hres; - hres = lookup_identifier(ctx, name, &ref); + hres = lookup_identifier(ctx, name, VBDISP_LET, &ref); if(FAILED(hres)) return hres; @@ -838,6 +846,8 @@ static void release_exec(exec_ctx_t *ctx) { unsigned i; + VariantClear(&ctx->ret_val); + if(ctx->args) { for(i=0; i < ctx->func->arg_cnt; i++) VariantClear(ctx->args+i); @@ -859,11 +869,6 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT vbsop_t op; HRESULT hres = S_OK; - if(res) { - FIXME("returning value is not implemented\n"); - return E_NOTIMPL; - } - exec.code = func->code_ctx; if(dp ? func->arg_cnt != arg_cnt(dp) : func->arg_cnt) { @@ -935,6 +940,14 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, DISPPARAMS *dp, VARIANT } assert(!exec.top); + if(func->type != FUNC_FUNCTION) + assert(V_VT(&exec.ret_val) == VT_EMPTY); + + if(SUCCEEDED(hres) && res) { + *res = exec.ret_val; + V_VT(&exec.ret_val) = VT_EMPTY; + } + release_exec(&exec); return hres; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 93af6b6..10f03f0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -313,4 +313,21 @@ End Function Call TestFuncExit(true) +Function ReturnTrue + ReturnTrue = false + ReturnTrue = true +End Function + +Call ok(ReturnTrue(), "ReturnTrue returned false?") + +Function SetVal(ByRef x, ByVal v) + x = v + SetVal = x + Exit Function +End Function + +x = false +ok SetVal(x, true), "SetVal returned false?" +Call ok(x, "x is not set to true by SetVal?") + reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5e86176..3fb57e4 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -61,6 +61,13 @@ typedef struct { LONG ref; } vbdisp_t; +typedef enum { + VBDISP_CALLGET, + VBDISP_LET, + VBDISP_SET, + VBDISP_ANY +} vbdisp_invoke_type_t; + HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*);

1 0

Jacek Caban : vbscript: Added 'and' expression parser/ compiler implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 69de07981a14cd74d44f98bc08034e5a4534a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69de07981a14cd74d44f98bc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:02 2011 +0200 vbscript: Added 'and' expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 21b50bd..9b74bb7 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -356,6 +356,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_ADD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_AND: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_and); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 5c75a14..5b57306 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -564,6 +564,12 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_and(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 6406fc2..d61a5f0 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_ADD, + EXPR_AND, EXPR_BOOL, EXPR_CONCAT, EXPR_DIV, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 870a665..5c04681 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -98,7 +98,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression +%type <expression> NotExpression UnaryExpression AndExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -188,7 +188,11 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression - : NotExpression { $$ = $1; } + : AndExpression { $$ = $1; } + +AndExpression + : NotExpression { $$ = $1; } + | AndExpression tAND NotExpression { $$ = new_binary_expression(ctx, EXPR_AND, $1, $3); CHECK_ERROR; } NotExpression : EqualityExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 3fb57e4..1d2f95d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -117,6 +117,7 @@ typedef enum { #define OP_LIST \ X(add, 1, 0, 0) \ + X(and, 1, 0, 0) \ X(assign_ident, 1, ARG_BSTR, 0) \ X(assign_member, 1, ARG_BSTR, 0) \ X(bool, 1, ARG_INT, 0) \

1 0

Jacek Caban : vbscript: Added interp_and implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 091f243051c80906f40edf544b0b1fab1f8a94fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=091f243051c80906f40edf544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:14 2011 +0200 vbscript: Added interp_and implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 5b57306..d5e0370 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -566,8 +566,26 @@ static HRESULT interp_not(exec_ctx_t *ctx) static HRESULT interp_and(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarAnd(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 10f03f0..69aeade 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -86,6 +86,11 @@ if(isEnglishLocale) then Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) end if +call ok(true and true, "true and true is not true") +call ok(true and not false, "true and not false is not true") +call ok(not (false and true), "not (false and true) is not true") +call ok(getVT(null and true) = "VT_NULL", "getVT(null and true) = " & getVT(null and true)) + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added 'or' expression parser/ compiler implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: fae7352f93e35eaed32d486e1c91e3c15616f4e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae7352f93e35eaed32d486e1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:26 2011 +0200 vbscript: Added 'or' expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9b74bb7..8b75918 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -388,6 +388,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; + case EXPR_OR: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); case EXPR_SUB: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d5e0370..e55d328 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -588,6 +588,12 @@ static HRESULT interp_and(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_or(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index d61a5f0..b4a91c8 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -34,6 +34,7 @@ typedef enum { EXPR_NEQUAL, EXPR_NOT, EXPR_NULL, + EXPR_OR, EXPR_STRING, EXPR_SUB, EXPR_ULONG, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5c04681..48843e7 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -98,7 +98,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression AndExpression +%type <expression> NotExpression UnaryExpression AndExpression OrExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -188,7 +188,11 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression + : OrExpression { $$ = $1; } + +OrExpression : AndExpression { $$ = $1; } + | OrExpression tOR AndExpression { $$ = new_binary_expression(ctx, EXPR_OR, $1, $3); CHECK_ERROR; } AndExpression : NotExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1d2f95d..2a05998 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -139,6 +139,7 @@ typedef enum { X(nequal, 1, 0, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ + X(or, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) \

1 0

Jacek Caban : vbscript: Added interp_or implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 4916c1b26ce096e83cda7c34818e06e1306241cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4916c1b26ce096e83cda7c348… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:37 2011 +0200 vbscript: Added interp_or implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e55d328..7316501 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -590,8 +590,26 @@ static HRESULT interp_and(exec_ctx_t *ctx) static HRESULT interp_or(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarOr(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 69aeade..c6a336d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -91,6 +91,12 @@ call ok(true and not false, "true and not false is not true") call ok(not (false and true), "not (false and true) is not true") call ok(getVT(null and true) = "VT_NULL", "getVT(null and true) = " & getVT(null and true)) +call ok(false or true, "false or uie is false?") +call ok(not (false or false), "false or false is not false?") +call ok(false and false or true, "false and false or true is false?") +call ok(true or false and false, "true or false and false is false?") +call ok(null or true, "null or true is false") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added xor, imp and eqv expressions parser/ compiler implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 43d10693ca62cf811d65570ffc4f897b67e074fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d10693ca62cf811d65570ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:59:49 2011 +0200 vbscript: Added xor, imp and eqv expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 6 ++++++ dlls/vbscript/interp.c | 18 ++++++++++++++++++ dlls/vbscript/parse.h | 5 ++++- dlls/vbscript/parser.y | 11 ++++++++++- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 8b75918..f74f5fe 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -370,10 +370,14 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); + case EXPR_EQV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eqv); case EXPR_EXP: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_exp); case EXPR_IDIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_idiv); + case EXPR_IMP: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_imp); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_MOD: @@ -398,6 +402,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); + case EXPR_XOR: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: FIXME("Unimplemented expression type %d\n", expr->type); return E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7316501..e166b21 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -612,6 +612,24 @@ static HRESULT interp_or(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_xor(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_eqv(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_imp(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT cmp_oper(exec_ctx_t *ctx) { variant_val_t l, r; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index b4a91c8..7e1124c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -25,8 +25,10 @@ typedef enum { EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, + EXPR_EQV, EXPR_EXP, EXPR_IDIV, + EXPR_IMP, EXPR_MEMBER, EXPR_MOD, EXPR_MUL, @@ -38,7 +40,8 @@ typedef enum { EXPR_STRING, EXPR_SUB, EXPR_ULONG, - EXPR_USHORT + EXPR_USHORT, + EXPR_XOR } expression_type_t; typedef struct _expression_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 48843e7..a6281d6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -98,7 +98,7 @@ static arg_decl_t *new_argument_decl(parser_ctx_t*,const WCHAR*,BOOL); %type <statement> Statement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression ModExpression IntdivExpression MultiplicativeExpression ExpExpression -%type <expression> NotExpression UnaryExpression AndExpression OrExpression +%type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -188,7 +188,16 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression + : EqvExpression { $$ = $1; } + | Expression tIMP EqvExpression { $$ = new_binary_expression(ctx, EXPR_IMP, $1, $3); CHECK_ERROR; } + +EqvExpression + : XorExpression { $$ = $1; } + | EqvExpression tEQV XorExpression { $$ = new_binary_expression(ctx, EXPR_EQV, $1, $3); CHECK_ERROR; } + +XorExpression : OrExpression { $$ = $1; } + | XorExpression tXOR OrExpression { $$ = new_binary_expression(ctx, EXPR_XOR, $1, $3); CHECK_ERROR; } OrExpression : AndExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2a05998..5f1d6ce 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -126,10 +126,12 @@ typedef enum { X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ + X(eqv, 1, 0, 0) \ X(exp, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(idiv, 1, 0, 0) \ + X(imp, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ @@ -143,7 +145,8 @@ typedef enum { X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) \ - X(sub, 1, 0, 0) + X(sub, 1, 0, 0) \ + X(xor, 1, 0, 0) typedef enum { #define X(x,n,a,b) OP_##x,

1 0

Jacek Caban : vbscript: Added interp_xor implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: f17b35fdebf34a0c271d9b8f5f49e4b25d1012b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17b35fdebf34a0c271d9b8f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:02 2011 +0200 vbscript: Added interp_xor implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e166b21..8a875ee 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -614,8 +614,26 @@ static HRESULT interp_or(exec_ctx_t *ctx) static HRESULT interp_xor(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarXor(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_eqv(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c6a336d..329df36 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -97,6 +97,11 @@ call ok(false and false or true, "false and false or true is false?") call ok(true or false and false, "true or false and false is false?") call ok(null or true, "null or true is false") +call ok(true xor false, "true xor false is false?") +call ok(not (false xor false), "false xor false is true?") +call ok(not (true or false xor true), "true or false xor true is true?") +call ok(not (true xor false or true), "true xor false or true is true?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added interp_eqv implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 89c9a737f4efe25f81793f7198fc70727b30aa92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89c9a737f4efe25f81793f719… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:12 2011 +0200 vbscript: Added interp_eqv implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8a875ee..1c01933 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -638,8 +638,26 @@ static HRESULT interp_xor(exec_ctx_t *ctx) static HRESULT interp_eqv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarEqv(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT interp_imp(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 329df36..0b24b2d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -102,6 +102,10 @@ call ok(not (false xor false), "false xor false is true?") call ok(not (true or false xor true), "true or false xor true is true?") call ok(not (true xor false or true), "true xor false or true is true?") +call ok(false eqv false, "false does not equal false?") +call ok(not (false eqv true), "false equals true?") +call ok(getVT(false eqv null) = "VT_NULL", "getVT(false eqv null) = " & getVT(false eqv null)) + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Jacek Caban : vbscript: Added interp_imp implementation.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 429bac4c8657e342c13299495d2265bf7302617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=429bac4c8657e342c13299495… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 13:00:23 2011 +0200 vbscript: Added interp_imp implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1c01933..2a50667 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -662,8 +662,26 @@ static HRESULT interp_eqv(exec_ctx_t *ctx) static HRESULT interp_imp(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarImp(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0b24b2d..b9b5c57 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -106,6 +106,11 @@ call ok(false eqv false, "false does not equal false?") call ok(not (false eqv true), "false equals true?") call ok(getVT(false eqv null) = "VT_NULL", "getVT(false eqv null) = " & getVT(false eqv null)) +call ok(true imp true, "true does not imp true?") +call ok(false imp false, "false does not imp false?") +call ok(not (true imp false), "true imp false?") +call ok(false imp null, "false imp null is false?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")

1 0

Aric Stewart : usp10: Set fNoGlyphIndex only if the fonts has no opentype/ truetype tables.
by Alexandre Julliard 14 Sep '11

14 Sep '11

Module: wine Branch: master Commit: 7ccf31bde84f28ff03698d6ae9d34dc67290bb18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccf31bde84f28ff03698d6ae… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Sep 14 08:53:05 2011 -0500 usp10: Set fNoGlyphIndex only if the fonts has no opentype/truetype tables. --- dlls/usp10/usp10.c | 8 +++----- dlls/usp10/usp10_internal.h | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 9095fe3..fe8f6a8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -427,6 +427,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) heap_free(sc); return E_INVALIDARG; } + sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); *psc = sc; TRACE("<- %p\n", sc); return S_OK; @@ -1747,11 +1748,8 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys; - /* set fNoGlyphIndex for symbolic, and device fonts or non truetype fonts */ - if (!psa->fNoGlyphIndex && - (!(get_cache_pitch_family(psc) & TMPF_TRUETYPE) || - (get_cache_pitch_family(psc) & TMPF_DEVICE) || - (((ScriptCache *)*psc)->tm.tmCharSet == SYMBOL_CHARSET))) + /* set fNoGlyphIndex non truetype/opentype fonts */ + if (!psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) psa->fNoGlyphIndex = TRUE; /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 09ffc65..e85afbe 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -85,6 +85,7 @@ typedef struct { typedef struct { LOGFONTW lf; TEXTMETRICW tm; + BOOL sfnt; WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table;

1 0