September 2011 - Wine-commits

Huw Davies : gdi32: The offsets should be signed.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: fcea54846415def1aac39458c062af1f69ed8568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcea54846415def1aac39458c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 9 16:19:25 2011 +0100 gdi32: The offsets should be signed. --- dlls/gdi32/dibdrv/objects.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 8575bb4..4833600 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -368,7 +368,7 @@ typedef struct static int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) { - unsigned int n, m; + int m, n; BOOL clipped = FALSE; DWORD start_oc, end_oc; const int bias = params->bias;

1 0

André Hentschel : ntdll: Remove dead increments (clang ).
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: c20813f15f8e92443a8f15b97c061e7bb9cafd8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c20813f15f8e92443a8f15b97… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 9 17:19:29 2011 +0200 ntdll: Remove dead increments (clang). --- dlls/ntdll/actctx.c | 1 - dlls/ntdll/path.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 75c1cbf..380ce8f 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2617,7 +2617,6 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle { afdi->lpAssemblyDirectoryName = ptr; memcpy(ptr, assembly->directory, ad_len * sizeof(WCHAR)); - ptr += ad_len; } else afdi->lpAssemblyDirectoryName = NULL; RtlFreeHeap( GetProcessHeap(), 0, assembly_id ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 6138fa8..23f2bbd 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -751,7 +751,6 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) memmove(buffer + reqsize / sizeof(WCHAR), name + dep, deplen + sizeof(WCHAR)); if (reqsize) memcpy(buffer, ins_str, reqsize); - reqsize += deplen; if (ins_str != tmp && ins_str != cd->Buffer) RtlFreeHeap(GetProcessHeap(), 0, ins_str);

1 0

André Hentschel : crypt32/tests: Remove dead assignment (clang).
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: cb55d2a255b2da4d040211102a1c2845d3640d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb55d2a255b2da4d040211102… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Sep 9 17:32:14 2011 +0200 crypt32/tests: Remove dead assignment (clang). --- dlls/crypt32/tests/base64.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index c5c436b..8f19515 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -117,11 +117,8 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen, "Expected %s, got %s\n", expected, ptr); ptr += strlen(expected); if (trailer) - { ok(!strncmp(trailer, ptr, strlen(trailer)), "Expected trailer %s, got %s\n", trailer, ptr); - ptr += strlen(trailer); - } HeapFree(GetProcessHeap(), 0, str); } }

1 0

Christian Costa : cmd: Add help info for xcopy.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 908834feefa0f8a9458e37b1718f85724ac10b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908834feefa0f8a9458e37b17… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Sep 9 09:16:51 2011 +0200 cmd: Add help info for xcopy. --- po/ar.po | 73 +++++++++++++++++++++++----------------------- po/bg.po | 73 +++++++++++++++++++++++----------------------- po/ca.po | 73 +++++++++++++++++++++++----------------------- po/cs.po | 73 +++++++++++++++++++++++----------------------- po/da.po | 73 +++++++++++++++++++++++----------------------- po/de.po | 73 +++++++++++++++++++++++----------------------- po/el.po | 73 +++++++++++++++++++++++----------------------- po/en.po | 74 ++++++++++++++++++++++++----------------------- po/en_US.po | 74 ++++++++++++++++++++++++----------------------- po/eo.po | 73 +++++++++++++++++++++++----------------------- po/es.po | 73 +++++++++++++++++++++++----------------------- po/fa.po | 73 +++++++++++++++++++++++----------------------- po/fi.po | 73 +++++++++++++++++++++++----------------------- po/fr.po | 73 +++++++++++++++++++++++----------------------- po/he.po | 73 +++++++++++++++++++++++----------------------- po/hi.po | 73 +++++++++++++++++++++++----------------------- po/hu.po | 73 +++++++++++++++++++++++----------------------- po/it.po | 73 +++++++++++++++++++++++----------------------- po/ja.po | 73 +++++++++++++++++++++++----------------------- po/ko.po | 74 ++++++++++++++++++++++++----------------------- po/lt.po | 74 ++++++++++++++++++++++++----------------------- po/ml.po | 73 +++++++++++++++++++++++----------------------- po/nb_NO.po | 73 +++++++++++++++++++++++----------------------- po/nl.po | 73 +++++++++++++++++++++++----------------------- po/or.po | 73 +++++++++++++++++++++++----------------------- po/pa.po | 73 +++++++++++++++++++++++----------------------- po/pl.po | 73 +++++++++++++++++++++++----------------------- po/pt_BR.po | 73 +++++++++++++++++++++++----------------------- po/pt_PT.po | 73 +++++++++++++++++++++++----------------------- po/rm.po | 73 +++++++++++++++++++++++----------------------- po/ro.po | 73 +++++++++++++++++++++++----------------------- po/ru.po | 73 +++++++++++++++++++++++----------------------- po/sk.po | 73 +++++++++++++++++++++++----------------------- po/sl.po | 73 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 73 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 73 +++++++++++++++++++++++----------------------- po/sv.po | 73 +++++++++++++++++++++++----------------------- po/te.po | 73 +++++++++++++++++++++++----------------------- po/th.po | 73 +++++++++++++++++++++++----------------------- po/tr.po | 73 +++++++++++++++++++++++----------------------- po/uk.po | 73 +++++++++++++++++++++++----------------------- po/wa.po | 73 +++++++++++++++++++++++----------------------- po/wine.pot | 73 +++++++++++++++++++++++----------------------- po/zh_CN.po | 73 +++++++++++++++++++++++----------------------- po/zh_TW.po | 73 +++++++++++++++++++++++----------------------- programs/cmd/builtins.c | 3 +- programs/cmd/cmd.rc | 1 + 47 files changed, 1672 insertions(+), 1621 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=908834feefa0f8a9458e3…

1 0

Jacek Caban : vbscript: Added support for |f a, b, c| call statement.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: a921bd2ea4f988d615ece2f9d1a24ff6e3ab593d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921bd2ea4f988d615ece2f9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:46:46 2011 +0200 vbscript: Added support for |f a, b, c| call statement. --- dlls/vbscript/lex.c | 22 +++++++++++++++++++--- dlls/vbscript/parser.y | 14 +++++++++----- dlls/vbscript/tests/lang.vbs | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 2fd51bc..41f76e9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -240,12 +240,17 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static void skip_spaces(parser_ctx_t *ctx) +{ + while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + ctx->ptr++; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') - ctx->ptr++; + skip_spaces(ctx); if(ctx->ptr == ctx->end) return ctx->last_token == tNL ? tEOF : tNL; @@ -269,7 +274,6 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) else ctx->ptr = ctx->end; return tNL; - case '(': case ')': case ',': case '=': @@ -281,6 +285,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '\\': case '.': return *ctx->ptr++; + case '(': + /* NOTE: + * We resolve empty brackets in lexer instead of parser to avoid complex conflicts + * in call statement special case |f()| without 'call' keyword + */ + ctx->ptr++; + skip_spaces(ctx); + if(*ctx->ptr == ')') { + ctx->ptr++; + return tEMPTYBRACKETS; + } + return '('; case '"': return parse_string_literal(ctx, lval); default: diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2d50565..72790fa 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -56,7 +56,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); member_expression_t *member; } -%token tEOF tNL tREM +%token tEOF tNL tREM tEMPTYBRACKETS %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD @@ -89,7 +89,7 @@ StatementNl : Statement tNL { $$ = $1; } Statement - : MemberExpression Arguments_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } + : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } MemberExpression @@ -97,17 +97,21 @@ MemberExpression /* FIXME: MemberExpressionArgs '.' tIdentifier */ Arguments_opt - : /* empty */ { $$ = NULL; } - | '(' ArgumentList_opt ')' { $$ = $2; } + : EmptyBrackets_opt { $$ = NULL; } + | '(' ArgumentList ')' { $$ = $2; } ArgumentList_opt - : /* empty */ { $$ = NULL; } + : EmptyBrackets_opt { $$ = NULL; } | ArgumentList { $$ = $1; } ArgumentList : Expression { $$ = $1; } | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } +EmptyBrackets_opt + : /* empty */ + | tEMPTYBRACKETS + Expression : LiteralExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 642c2ff..55a8cad 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -17,5 +17,6 @@ ' call ok(true, "true is not true?") +ok true, "true is not true?" reportSuccess()

1 0

Jacek Caban : vbscript: Added parser/compiler support for |option explicit| .
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 8108b4040ca140dd7567adf698943de56edaa616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8108b4040ca140dd7567adf69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:00 2011 +0200 vbscript: Added parser/compiler support for |option explicit|. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 5 ++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 14 +++++++++++--- dlls/vbscript/tests/lang.vbs | 2 ++ dlls/vbscript/vbscript.h | 2 ++ 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7e8fe3b..ea55177 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -256,6 +256,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 0; ctx->instr_size = 32; + ret->option_explicit = ctx->parser.option_explicit; + ret->bstr_pool = NULL; ret->bstr_pool_size = 0; ret->bstr_cnt = 0; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f5254c4..a33ff90 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -29,6 +29,7 @@ typedef struct { vbscode_t *code; instr_t *instr; script_ctx_t *script; + function_t *func; unsigned stack_size; unsigned top; @@ -70,7 +71,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) } } - FIXME("create if no option explicit\n"); + if(!ctx->func->code_ctx->option_explicit) + FIXME("create an attempt to set\n"); ref->type = REF_NONE; return S_OK; @@ -223,6 +225,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func) exec.code = func->code_ctx; exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; + exec.func = func; while(exec.instr) { op = exec.instr->op; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index a0c7f2c..5f7fba2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -63,6 +63,7 @@ typedef struct { const WCHAR *ptr; const WCHAR *end; + BOOL option_explicit; BOOL parse_complete; HRESULT hres; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 72790fa..258420d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(const char*); -static void parse_complete(parser_ctx_t*); + static void parse_complete(parser_ctx_t*,BOOL); static void source_add_statement(parser_ctx_t*,statement_t*); @@ -54,6 +54,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + BOOL bool; } %token tEOF tNL tREM tEMPTYBRACKETS @@ -75,11 +76,16 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <expression> Expression LiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList +%type <bool> OptionExplicit_opt %% Program - : SourceElements tEOF { parse_complete(ctx); } + : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } + +OptionExplicit_opt + : /* empty */ { $$ = FALSE; } + | tOPTION tEXPLICIT tNL { $$ = TRUE; } SourceElements : /* empty */ @@ -137,9 +143,10 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) } } -static void parse_complete(parser_ctx_t *ctx) +static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) { ctx->parse_complete = TRUE; + ctx->option_explicit = option_explicit; } static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) @@ -240,6 +247,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; + ctx->option_explicit = FALSE; parser_parse(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 55a8cad..07585fa 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -16,6 +16,8 @@ ' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA ' +Option Explicit + call ok(true, "true is not true?") ok true, "true is not true?" diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a1428bb..54d7da5 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -109,6 +109,8 @@ struct _vbscode_t { instr_t *instrs; WCHAR *source; + BOOL option_explicit; + BOOL global_executed; function_t global_code;

1 0

Jacek Caban : vbscript: Added support for parentheses in expressions.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: a17f9aa07ad94888a21cc14c83d47fa923d30974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17f9aa07ad94888a21cc14c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:21 2011 +0200 vbscript: Added support for parentheses in expressions. --- dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 258420d..728d69b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -73,7 +73,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression +%type <expression> Expression LiteralExpression PrimaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -120,12 +120,16 @@ EmptyBrackets_opt Expression : LiteralExpression /* FIXME */ { $$ = $1; } + | PrimaryExpression /* FIXME */ { $$ = $1; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } +PrimaryExpression + : '(' Expression ')' { $$ = $2; } + %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 07585fa..32fc903 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -20,5 +20,6 @@ Option Explicit call ok(true, "true is not true?") ok true, "true is not true?" +call ok((true), "true is not true?") reportSuccess()

1 0

Jacek Caban : vbscript: Added parser support for |not| expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 39dd08ad7debaf4cb0cbb1e0fd91732f9f81b263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dd08ad7debaf4cb0cbb1e0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:32 2011 +0200 vbscript: Added parser support for |not| expression. --- dlls/vbscript/parse.h | 6 ++++++ dlls/vbscript/parser.y | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 5f7fba2..0e1b4d1 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -19,6 +19,7 @@ typedef enum { EXPR_BOOL, EXPR_MEMBER, + EXPR_NOT, EXPR_STRING } expression_type_t; @@ -39,6 +40,11 @@ typedef struct { typedef struct { expression_t expr; + expression_t *subexpr; +} unary_expression_t; + +typedef struct { + expression_t expr; expression_t *obj_expr; const WCHAR *identifier; expression_t *args; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 728d69b..a743b97 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -37,6 +37,7 @@ static void source_add_statement(parser_ctx_t*,statement_t*); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); +static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -74,6 +75,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression +%type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -119,8 +121,12 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression + : NotExpression { $$ = $1; } + +NotExpression : LiteralExpression /* FIXME */ { $$ = $1; } | PrimaryExpression /* FIXME */ { $$ = $1; } + | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } @@ -190,6 +196,18 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *subexpr) +{ + unary_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->subexpr = subexpr; + return &expr->expr; +} + static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *obj_expr, const WCHAR *identifier) { member_expression_t *expr;

1 0

Jacek Caban : vbscript: Added compiler support for |not| expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 7f9464ce2759eb96ccc0bb7b782ce029689f692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9464ce2759eb96ccc0bb7b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:45 2011 +0200 vbscript: Added compiler support for |not| expression. --- dlls/vbscript/compile.c | 13 +++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index ea55177..c64c30c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -165,11 +165,24 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t return hres; } +static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->subexpr); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_NOT: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); default: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a33ff90..f582e80 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -198,6 +198,12 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_not(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 54d7da5..3f55b40 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,6 +77,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Jacek Caban : vbscript: Added interp_not implementation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 6ca3cb623e1022b52af15a5747c80162426b19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca3cb623e1022b52af15a574… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:55 2011 +0200 vbscript: Added interp_not implementation. --- dlls/vbscript/interp.c | 53 ++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/lang.vbs | 3 ++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f582e80..0c3470b 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -53,6 +53,12 @@ typedef struct { } u; } ref_t; +typedef struct { + VARIANT *v; + VARIANT store; + BOOL owned; +} variant_val_t; + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; @@ -109,6 +115,35 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) +{ + VARIANT *var; + + var = stack_pop(ctx); + + if(V_VT(var) == (VT_BYREF|VT_VARIANT)) { + v->owned = FALSE; + var = V_VARIANTREF(var); + }else { + v->owned = TRUE; + } + + if(V_VT(var) == VT_DISPATCH) { + FIXME("got dispatch - get its default value\n"); + return E_NOTIMPL; + }else { + v->v = var; + } + + return S_OK; +} + +static inline void release_val(variant_val_t *v) +{ + if(v->owned) + VariantClear(v->v); +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -200,8 +235,22 @@ static HRESULT interp_string(exec_ctx_t *ctx) static HRESULT interp_not(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + hres = VarNot(val.v, &v); + release_val(&val); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 32fc903..8f13c9c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -22,4 +22,7 @@ call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") +ok not false, "not false but not true?" +ok not not true, "not not true but not true?" + reportSuccess()

1 0