September 2011 - Wine-Commits

Jacek Caban : vbscript: Added Exit Function statement implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 1cefcdb6b7085f23c17dcddd1e928ec26ebd867b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cefcdb6b7085f23c17dcddd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 12:58:10 2011 +0200 vbscript: Added Exit Function statement implementation. --- dlls/vbscript/compile.c | 23 ++++++++++++++++++++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 9 +++++++++ 4 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index a4608be..21b50bd 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -39,6 +39,7 @@ typedef struct { unsigned labels_cnt; unsigned sub_end_label; + unsigned func_end_label; dim_decl_t *dim_decls; dynamic_var_t *global_vars; @@ -555,6 +556,16 @@ static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) return push_instr_addr(ctx, OP_jmp, ctx->sub_end_label); } +static HRESULT compile_exitfunc_statement(compile_ctx_t *ctx) +{ + if(ctx->func_end_label == -1) { + FIXME("Exit Function outside Function?\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->func_end_label); +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; @@ -570,6 +581,9 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_DIM: hres = compile_dim_statement(ctx, (dim_statement_t*)stat); break; + case STAT_EXITFUNC: + hres = compile_exitfunc_statement(ctx); + break; case STAT_EXITSUB: hres = compile_exitsub_statement(ctx); break; @@ -614,14 +628,19 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; ctx->sub_end_label = -1; + ctx->func_end_label = -1; switch(func->type) { + case FUNC_FUNCTION: + ctx->func_end_label = alloc_label(ctx); + if(ctx->func_end_label == -1) + return E_OUTOFMEMORY; /* FIXME ! */ + break; case FUNC_SUB: ctx->sub_end_label = alloc_label(ctx); if(ctx->sub_end_label == -1) return E_OUTOFMEMORY; break; - case FUNC_FUNCTION: /* FIXME */ case FUNC_GLOBAL: break; } @@ -635,6 +654,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->sub_end_label != -1) label_set_addr(ctx, ctx->sub_end_label); + if(ctx->func_end_label != -1) + label_set_addr(ctx, ctx->func_end_label); if(push_instr(ctx, OP_ret) == -1) return E_OUTOFMEMORY; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 69eca61..6406fc2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -86,6 +86,7 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_EXITFUNC, STAT_EXITSUB, STAT_FUNC, STAT_IF diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 36edc02..870a665 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -139,6 +139,7 @@ Statement | tDIM DimDeclList { $$ = new_dim_statement(ctx, $2); CHECK_ERROR; } | IfStatement { $$ = $1; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } + | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } MemberExpression diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 5f47360..93af6b6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -304,4 +304,13 @@ y = true Call TestFuncLocalVal Call ok(x, "global x is not true?") +Function TestFuncExit(ByRef a) + If a Then + Exit Function + End If + Call ok(false, "Exit Function not called?") +End Function + +Call TestFuncExit(true) + reportSuccess()

1 0

Jacek Caban : vbscript: Added interp_and implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 Sept. 14, 2011

Sept. 14, 2011

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_imp implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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

Maarten Lankhorst : winegstreamer: Use WAVE_FORMAT_PCM when possible for demux.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 6df92c11cabfd7d8c1289afe81442c7cb7669d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df92c11cabfd7d8c1289afe8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Sep 13 15:32:31 2011 +0200 winegstreamer: Use WAVE_FORMAT_PCM when possible for demux. --- dlls/winegstreamer/gstdemux.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6670d6b..655a9f2 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -147,8 +147,13 @@ static int amt_from_gst_caps_audio(GstCaps *caps, AM_MEDIA_TYPE *amt) { if (!strcmp(typename, "audio/x-raw-float")) { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; wfx->wBitsPerSample = wfe->Samples.wValidBitsPerSample = 32; - } else + } else { wfe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + if (wfx->nChannels <= 2 && bpp <= 16 && depth == bpp) { + wfx->wFormatTag = WAVE_FORMAT_PCM; + wfx->cbSize = 0; + } + } wfx->nBlockAlign = wfx->nChannels * wfx->wBitsPerSample/8; wfx->nAvgBytesPerSec = wfx->nSamplesPerSec * wfx->nBlockAlign; return 1;

1 0

Frédéric Delanoy : cmd: Make some variables static.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 9bf515974dc2f5c0328d2af341639b62b146d99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf515974dc2f5c0328d2af34… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 13 10:33:47 2011 +0200 cmd: Make some variables static. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 716db4b..1e3defa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -45,7 +45,7 @@ static void WCMD_part_execute(CMD_LIST **commands, const WCHAR *firstcmd, const WCHAR *variable, const WCHAR *value, BOOL isIF, BOOL conditionTRUE); -struct env_stack *saved_environment; +static struct env_stack *saved_environment; struct env_stack *pushd_directories; extern HINSTANCE hinst; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 840c5da..02260e3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -99,7 +99,7 @@ extern struct env_stack *pushd_directories; static const WCHAR *pagedMessage = NULL; static char *output_bufA = NULL; #define MAX_WRITECONSOLE_SIZE 65535 -BOOL unicodePipes = FALSE; +static BOOL unicodePipes = FALSE; /*******************************************************************

1 0

Jacek Caban : vbscript: Added function parser implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: 78957118fb91c3fc4aecb6ec19f1225f796f9d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=78957118fb91c3fc4aecb6ec1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 14 16:55:51 2011 +0200 vbscript: Added function parser implementation. --- dlls/vbscript/compile.c | 2 + dlls/vbscript/parser.y | 2 + dlls/vbscript/tests/lang.vbs | 63 ++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/vbscript.c | 3 -- dlls/vbscript/vbscript.h | 1 + 5 files changed, 68 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index dd756b3..a4608be 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -621,6 +621,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(ctx->sub_end_label == -1) return E_OUTOFMEMORY; break; + case FUNC_FUNCTION: /* FIXME */ case FUNC_GLOBAL: break; } @@ -833,6 +834,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->bstr_pool = NULL; ret->bstr_pool_size = 0; ret->bstr_cnt = 0; + ret->global_executed = FALSE; ret->global_code.type = FUNC_GLOBAL; ret->global_code.name = NULL; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index f406f8e..36edc02 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -253,6 +253,8 @@ PrimaryExpression FunctionDecl : /* Storage_opt */ tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB { $$ = new_function_decl(ctx, $2, FUNC_SUB, $3, $5); CHECK_ERROR; } + | /* Storage_opt */ tFUNCTION tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tFUNCTION + { $$ = new_function_decl(ctx, $2, FUNC_FUNCTION, $3, $5); CHECK_ERROR; } ArgumentsDecl_opt : EmptyBrackets_opt { $$ = NULL; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a46394b..5f47360 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -241,4 +241,67 @@ y = true Call TestSubLocalVal Call ok(x, "global x is not true?") +if false then +Function testfunc + x = true +End Function +end if + +x = false +Call TestFunc +Call ok(x, "x is false, testfunc not called?") + +Function FuncSetTrue(v) + Call ok(not v, "v is not true") + v = true +End Function + +x = false +FuncSetTrue x +Call ok(x, "x was not set by FuncSetTrue") + +FuncSetTrue false +Call ok(not false, "false is no longer false?") + +Function FuncSetTrue2(ByRef v) + Call ok(not v, "v is not true") + v = true +End Function + +x = false +FuncSetTrue2 x +Call ok(x, "x was not set by FuncSetTrue") + +Function TestFuncArgVal(ByVal v) + Call ok(not v, "v is not false") + v = true + Call ok(v, "v is not true?") +End Function + +x = false +Call TestFuncArgVal(x) +Call ok(not x, "x is true after TestFuncArgVal call?") + +Function TestFuncMultiArgs(a,b,c,d,e) + Call ok(a=1, "a = " & a) + Call ok(b=2, "b = " & b) + Call ok(c=3, "c = " & c) + Call ok(d=4, "d = " & d) + Call ok(e=5, "e = " & e) +End Function + +TestFuncMultiArgs 1, 2, 3, 4, 5 +Call TestFuncMultiArgs(1, 2, 3, 4, 5) + +Function TestFuncLocalVal + x = false + Call ok(not x, "local x is not false?") + Dim x +End Function + +x = true +y = true +Call TestFuncLocalVal +Call ok(x, "global x is not true?") + reportSuccess() diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index ab5c8af..6ead8f4 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -412,7 +412,6 @@ static void test_vbscript_uninitializing(void) test_state(script, SCRIPTSTATE_INITIALIZED); hres = IActiveScriptParse64_ParseScriptText(parse, script_textW, NULL, NULL, NULL, 0, 1, 0x42, NULL, NULL); - todo_wine ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); hres = IActiveScript_SetScriptSite(script, &ActiveScriptSite); @@ -441,9 +440,7 @@ static void test_vbscript_uninitializing(void) hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_CONNECTED); ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_CONNECTED) failed: %08x\n", hres); CHECK_CALLED(OnStateChange_CONNECTED); - todo_wine CHECK_CALLED(OnEnterScript); - todo_wine CHECK_CALLED(OnLeaveScript); test_state(script, SCRIPTSTATE_CONNECTED); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index cf625cc..5e86176 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -164,6 +164,7 @@ typedef struct { typedef enum { FUNC_GLOBAL, + FUNC_FUNCTION, FUNC_SUB } function_type_t;

1 0

Jacek Caban : vbscript: Added interp_or implementation.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

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 Sept. 14, 2011

Sept. 14, 2011

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

Alexandre Julliard : msvcrt: Synchronize the spec files.
by Alexandre Julliard Sept. 14, 2011

Sept. 14, 2011

Module: wine Branch: master Commit: f127a2c0757b7886004d4a215ae8c74ec9df27be URL: http://source.winehq.org/git/wine.git/?a=commit;h=f127a2c0757b7886004d4a215… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 14 16:27:26 2011 +0200 msvcrt: Synchronize the spec files. --- dlls/crtdll/crtdll.spec | 12 ++++++------ dlls/msvcr100/msvcr100.spec | 16 ++++++++-------- dlls/msvcr70/msvcr70.spec | 12 ++++++------ dlls/msvcr71/msvcr71.spec | 12 ++++++------ dlls/msvcr80/msvcr80.spec | 16 ++++++++-------- dlls/msvcr90/msvcr90.spec | 16 ++++++++-------- dlls/msvcrt20/msvcrt20.spec | 12 ++++++------ dlls/msvcrt40/msvcrt40.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 12 ++++++------ 9 files changed, 60 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f127a2c0757b7886004d4…

1 0