September 2011 - Wine-commits

Jacek Caban : vbscript: Added Call statement implementation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 23fc7678deea6a753ebed46acd3bd4e65910cca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23fc7678deea6a753ebed46ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:56:05 2011 +0200 vbscript: Added Call statement implementation. --- dlls/vbscript/parser.y | 3 ++- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 447aa12..caf6f49 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -74,7 +74,8 @@ StatementNl : Statement tNL { $$ = $1; } Statement - : MemberExpression Arguments_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } + : MemberExpression Arguments_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 : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 9b1abd4..6f1a967 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -475,6 +475,12 @@ static void run_tests(void) parse_script_a("reportSuccess()"); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("Call reportSuccess"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Added more keywords to lexer.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 7cbc5235bdd9904b06361e1be09285b43da1f006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbc5235bdd9904b06361e1be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:56:18 2011 +0200 vbscript: Added more keywords to lexer. --- dlls/vbscript/lex.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/parser.y | 15 ++++++- 2 files changed, 110 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index af01220..04ade1e 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -26,13 +26,109 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static const WCHAR andW[] = {'a','n','d',0}; +static const WCHAR byrefW[] = {'b','y','r','e','f',0}; +static const WCHAR byvalW[] = {'b','y','v','a','l',0}; static const WCHAR callW[] = {'c','a','l','l',0}; +static const WCHAR classW[] = {'c','l','a','s','s',0}; +static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; +static const WCHAR dimW[] = {'d','i','m',0}; +static const WCHAR doW[] = {'d','o',0}; +static const WCHAR elseW[] = {'e','l','s','e',0}; +static const WCHAR elseifW[] = {'e','l','s','e','i','f',0}; +static const WCHAR emptyW[] = {'e','m','p','t','y',0}; +static const WCHAR endW[] = {'e','n','d',0}; +static const WCHAR eqvW[] = {'e','q','v',0}; +static const WCHAR errorW[] = {'e','r','r','o','r',0}; +static const WCHAR exitW[] = {'e','x','i','t',0}; +static const WCHAR explicitW[] = {'e','x','p','l','i','c','i','t',0}; +static const WCHAR falseW[] = {'f','a','l','s','e',0}; +static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; +static const WCHAR getW[] = {'g','e','t',0}; +static const WCHAR gotoW[] = {'g','o','t','o',0}; +static const WCHAR ifW[] = {'i','f',0}; +static const WCHAR impW[] = {'i','m','p',0}; +static const WCHAR isW[] = {'i','s',0}; +static const WCHAR letW[] = {'l','e','t',0}; +static const WCHAR loopW[] = {'l','o','o','p',0}; +static const WCHAR meW[] = {'m','e',0}; +static const WCHAR modW[] = {'m','o','d',0}; +static const WCHAR newW[] = {'n','e','w',0}; +static const WCHAR nextW[] = {'n','e','x','t',0}; +static const WCHAR notW[] = {'n','o','t',0}; +static const WCHAR nothingW[] = {'n','o','t','h','i','n','g',0}; +static const WCHAR nullW[] = {'n','u','l','l',0}; +static const WCHAR onW[] = {'o','n',0}; +static const WCHAR optionW[] = {'o','p','t','i','o','n',0}; +static const WCHAR orW[] = {'o','r',0}; +static const WCHAR privateW[] = {'p','r','i','v','a','t','e',0}; +static const WCHAR propertyW[] = {'p','r','o','p','e','r','t','y',0}; +static const WCHAR publicW[] = {'p','u','b','l','i','c',0}; +static const WCHAR remW[] = {'r','e','m',0}; +static const WCHAR resumeW[] = {'r','e','s','u','m','e',0}; +static const WCHAR setW[] = {'s','e','t',0}; +static const WCHAR stopW[] = {'s','t','o','p',0}; +static const WCHAR subW[] = {'s','u','b',0}; +static const WCHAR thenW[] = {'t','h','e','n',0}; +static const WCHAR trueW[] = {'t','r','u','e',0}; +static const WCHAR untilW[] = {'u','n','t','i','l',0}; +static const WCHAR wendW[] = {'w','e','n','d',0}; +static const WCHAR whileW[] = {'w','h','i','l','e',0}; +static const WCHAR xorW[] = {'x','o','r',0}; static const struct { const WCHAR *word; int token; } keywords[] = { - {callW, tCALL} + {andW, tAND}, + {byrefW, tBYREF}, + {byvalW, tBYVAL}, + {callW, tCALL}, + {classW, tCLASS}, + {defaultW, tDEFAULT}, + {dimW, tDIM}, + {doW, tDO}, + {elseW, tELSE}, + {elseifW, tELSEIF}, + {emptyW, tEMPTY}, + {endW, tEND}, + {eqvW, tEQV}, + {errorW, tERROR}, + {exitW, tEXIT}, + {explicitW, tEXPLICIT}, + {falseW, tFALSE}, + {functionW, tFUNCTION}, + {getW, tGET}, + {gotoW, tGOTO}, + {ifW, tIF}, + {impW, tIMP}, + {isW, tIS}, + {letW, tLET}, + {loopW, tLOOP}, + {meW, tME}, + {modW, tMOD}, + {newW, tNEW}, + {nextW, tNEXT}, + {notW, tNOT}, + {nothingW, tNOTHING}, + {nullW, tNULL}, + {onW, tON}, + {optionW, tOPTION}, + {orW, tOR}, + {privateW, tPRIVATE}, + {propertyW, tPROPERTY}, + {publicW, tPUBLIC}, + {remW, tREM}, + {resumeW, tRESUME}, + {setW, tSET}, + {stopW, tSTOP}, + {subW, tSUB}, + {thenW, tTHEN}, + {trueW, tTRUE}, + {untilW, tUNTIL}, + {wendW, tWEND}, + {whileW, tWHILE}, + {xorW, tXOR} }; static inline BOOL is_identifier_char(WCHAR c) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index caf6f49..2fe9bdb 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -53,8 +53,19 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); member_expression_t *member; } -%token tEOF tNL blah -%token tCALL +%token tEOF tNL tREM +%token tTRUE tFALSE +%token tNOT tAND tOR tXOR tEQV tIMP tNEQ +%token tIS tLTEQ tGTEQ tMOD +%token tCALL tDIM tSUB tFUNCTION tPROPERTY tGET tLET +%token tIF tELSE tELSEIF tEND tTHEN tEXIT +%token tWHILE tWEND tDO tLOOP tUNTIL +%token tBYREF tBYVAL +%token tOPTION tEXPLICIT +%token tSTOP +%token tNOTHING tEMPTY tNULL +%token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME +%token tERROR tNEXT tON tRESUME tGOTO %token <string> tIdentifier %type <statement> Statement StatementNl

1 0

Jacek Caban : vbscript: Added bool literals parsing support.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: d145d0c03735685486a52b66477c2c855721788b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d145d0c03735685486a52b664… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:56:36 2011 +0200 vbscript: Added bool literals parsing support. --- dlls/vbscript/parse.h | 6 ++++++ dlls/vbscript/parser.y | 30 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 7c9ab26..df337d2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -17,6 +17,7 @@ */ typedef enum { + EXPR_BOOL, EXPR_MEMBER } expression_type_t; @@ -27,6 +28,11 @@ typedef struct _expression_t { typedef struct { expression_t expr; + VARIANT_BOOL value; +} bool_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 2fe9bdb..3761b13 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -35,6 +35,8 @@ static void parse_complete(parser_ctx_t*); static void source_add_statement(parser_ctx_t*,statement_t*); +static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); + static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); @@ -69,8 +71,9 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier %type <statement> Statement StatementNl +%type <expression> Expression LiteralExpression %type <member> MemberExpression -%type <expression> Arguments_opt ArgumentList_opt +%type <expression> Arguments_opt ArgumentList_opt ArgumentList %% @@ -98,7 +101,18 @@ Arguments_opt ArgumentList_opt : /* empty */ { $$ = NULL; } - /* | ArgumentList { $$ = $1; } */ + | ArgumentList { $$ = $1; } + +ArgumentList + : Expression { $$ = $1; } + | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } + +Expression + : LiteralExpression /* FIXME */ { $$ = $1; } + +LiteralExpression + : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } + | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } %% @@ -135,6 +149,18 @@ static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned return expr; } +static expression_t *new_bool_expression(parser_ctx_t *ctx, VARIANT_BOOL value) +{ + bool_expression_t *expr; + + expr = new_expression(ctx, EXPR_BOOL, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + 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 lexer support for string literals.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 0e415e0c0f512bf3ab937aedb917650847488d55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e415e0c0f512bf3ab937aedb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:56:48 2011 +0200 vbscript: Added lexer support for string literals. --- dlls/vbscript/lex.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/parser.y | 2 +- 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 04ade1e..2fd51bc 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -197,6 +197,49 @@ static int parse_identifier(parser_ctx_t *ctx, const WCHAR **ret) return tIdentifier; } +static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) +{ + const WCHAR *ptr = ++ctx->ptr; + WCHAR *rptr; + int len = 0; + + while(ctx->ptr < ctx->end) { + if(*ctx->ptr == '\n') { + FIXME("newline inside string literal\n"); + return 0; + } + + if(*ctx->ptr == '"') { + if(ctx->ptr[1] != '"') + break; + len--; + ctx->ptr++; + } + ctx->ptr++; + } + + if(ctx->ptr == ctx->end) { + FIXME("unterminated string literal\n"); + return 0; + } + + len += ctx->ptr-ptr; + + *ret = rptr = parser_alloc(ctx, (len+1)*sizeof(WCHAR)); + if(!rptr) + return 0; + + while(ptr < ctx->ptr) { + if(*ptr == '"') + ptr++; + *rptr++ = *ptr++; + } + + *rptr = 0; + ctx->ptr++; + return tString; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; @@ -238,6 +281,8 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '\\': case '.': return *ctx->ptr++; + case '"': + return parse_string_literal(ctx, lval); default: FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); } diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 3761b13..06a0eb3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -68,7 +68,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token tNOTHING tEMPTY tNULL %token tCLASS tSET tNEW tPUBLIC tPRIVATE tDEFAULT tME %token tERROR tNEXT tON tRESUME tGOTO -%token <string> tIdentifier +%token <string> tIdentifier tString %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression

1 0

Jacek Caban : vbscript: Added parser support for string literals.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: dc73a7c4bba5e12eec196613e23b3967ad282bda URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc73a7c4bba5e12eec196613e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:56:58 2011 +0200 vbscript: Added parser support for string literals. --- dlls/vbscript/parse.h | 8 +++++++- dlls/vbscript/parser.y | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index df337d2..a0c7f2c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,7 +18,8 @@ typedef enum { EXPR_BOOL, - EXPR_MEMBER + EXPR_MEMBER, + EXPR_STRING } expression_type_t; typedef struct _expression_t { @@ -33,6 +34,11 @@ typedef struct { typedef struct { expression_t expr; + const WCHAR *value; +} string_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 06a0eb3..2d50565 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -36,6 +36,7 @@ static void parse_complete(parser_ctx_t*); 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 member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -113,6 +114,7 @@ Expression 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; } %% @@ -161,6 +163,18 @@ static expression_t *new_bool_expression(parser_ctx_t *ctx, VARIANT_BOOL value) return &expr->expr; } +static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value) +{ + string_expression_t *expr; + + expr = new_expression(ctx, EXPR_STRING, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + 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 boolean literals.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 23c1fea07e5cf78c18db3876c24f00b9b2233ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c1fea07e5cf78c18db3876c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:16 2011 +0200 vbscript: Added compiler support for boolean literals. --- dlls/vbscript/compile.c | 60 ++++++++++++++++++++++++++++++++++++++++----- dlls/vbscript/interp.c | 12 +++++++++ dlls/vbscript/vbscript.h | 9 +++++- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 49d933b..cc3b683 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -34,6 +34,8 @@ typedef struct { vbscode_t *code; } compile_ctx_t; +static HRESULT compile_expression(compile_ctx_t*,expression_t*); + static inline instr_t *instr_ptr(compile_ctx_t *ctx, unsigned id) { assert(id < ctx->instr_cnt); @@ -59,6 +61,18 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) return ctx->instr_cnt++; } +static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.lng = arg; + return S_OK; +} + static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) { if(!ctx->code->bstr_pool_size) { @@ -84,12 +98,12 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; } -static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg1, unsigned arg2) { unsigned instr; BSTR bstr; - bstr = alloc_bstr_arg(ctx, arg); + bstr = alloc_bstr_arg(ctx, arg1); if(!bstr) return E_OUTOFMEMORY; @@ -98,28 +112,60 @@ static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; + instr_ptr(ctx, instr)->arg2.uint = arg2; return S_OK; } -static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret) { + unsigned arg_cnt = 0; HRESULT hres; - if(expr->args) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + while(args) { + hres = compile_expression(ctx, args); + if(FAILED(hres)) + return hres; + + arg_cnt++; + args = args->next; } + *ret = arg_cnt; + return S_OK; +} + +static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +{ + unsigned arg_cnt = 0; + HRESULT hres; + + hres = compile_args(ctx, expr->args, &arg_cnt); + if(FAILED(hres)) + return hres; + if(expr->obj_expr) { FIXME("obj_expr not implemented\n"); hres = E_NOTIMPL; }else { - hres = push_instr_bstr(ctx, OP_icallv, expr->identifier); + hres = push_instr_bstr_uint(ctx, OP_icallv, expr->identifier, arg_cnt); } return hres; } +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); + default: + FIXME("Unimplemented expression type %d\n", expr->type); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b309397..a70a4dd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -75,12 +75,18 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; DISPPARAMS dp = {0}; ref_t ref; HRESULT hres; TRACE("\n"); + if(arg_cnt) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + hres = lookup_identifier(ctx, identifier, &ref); if(FAILED(hres)) return hres; @@ -107,6 +113,12 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_bool(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 8aca01c..c0adc57 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -69,11 +69,14 @@ HRESULT init_global(script_ctx_t*); typedef enum { ARG_NONE = 0, ARG_STR, - ARG_BSTR + ARG_BSTR, + ARG_INT, + ARG_UINT } instr_arg_type_t; #define OP_LIST \ - X(icallv, 1, ARG_BSTR, 0) \ + X(bool, 1, ARG_INT, 0) \ + X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) typedef enum { @@ -86,6 +89,8 @@ OP_LIST typedef union { const WCHAR *str; BSTR bstr; + unsigned uint; + LONG lng; } instr_arg_t; typedef struct {

1 0

Jacek Caban : vbscript: Added compiler support for string literals.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: ded37832fbe1951e52973f3afdd08bd808a6b0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded37832fbe1951e52973f3af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:31 2011 +0200 vbscript: Added compiler support for string literals. --- dlls/vbscript/compile.c | 14 ++++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 3 ++- 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index cc3b683..7e8fe3b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -73,6 +73,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) return S_OK; } +static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.str = arg; + return S_OK; +} + static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) { if(!ctx->code->bstr_pool_size) { @@ -158,6 +170,8 @@ 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_STRING: + return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); 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 a70a4dd..b498a91 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -119,6 +119,12 @@ static HRESULT interp_bool(exec_ctx_t *ctx) return E_NOTIMPL; } +static HRESULT interp_string(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 c0adc57..a1428bb 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,7 +77,8 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ - X(ret, 0, 0, 0) + X(ret, 0, 0, 0) \ + X(string, 1, ARG_STR, 0) typedef enum { #define X(x,n,a,b) OP_##x,

1 0

Jacek Caban : vbscript: Added interp_bool implementation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 01e2bea114b88f2c5f45533b6a8f9367e573ab90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e2bea114b88f2c5f45533b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:45 2011 +0200 vbscript: Added interp_bool implementation. --- dlls/vbscript/interp.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b498a91..df296fa 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -29,6 +29,10 @@ typedef struct { vbscode_t *code; instr_t *instr; script_ctx_t *script; + + unsigned stack_size; + unsigned top; + VARIANT *stack; } exec_ctx_t; typedef HRESULT (*instr_func_t)(exec_ctx_t*); @@ -72,6 +76,37 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) return S_OK; } +static inline VARIANT *stack_pop(exec_ctx_t *ctx) +{ + assert(ctx->top); + return ctx->stack + --ctx->top; +} + +static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) +{ + if(ctx->stack_size == ctx->top) { + VARIANT *new_stack; + + new_stack = heap_realloc(ctx->stack, ctx->stack_size*2); + if(!new_stack) { + VariantClear(v); + return E_OUTOFMEMORY; + } + + ctx->stack = new_stack; + ctx->stack_size *= 2; + } + + ctx->stack[ctx->top++] = *v; + return S_OK; +} + +static void stack_popn(exec_ctx_t *ctx, unsigned n) +{ + while(n--) + VariantClear(stack_pop(ctx)); +} + static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; @@ -115,8 +150,14 @@ static HRESULT interp_ret(exec_ctx_t *ctx) static HRESULT interp_bool(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const VARIANT_BOOL arg = ctx->instr->arg1.lng; + VARIANT v; + + TRACE("%s\n", arg ? "true" : "false"); + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = arg; + return stack_push(ctx, &v); } static HRESULT interp_string(exec_ctx_t *ctx) @@ -143,6 +184,12 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func) vbsop_t op; HRESULT hres = S_OK; + exec.stack_size = 16; + exec.top = 0; + exec.stack = heap_alloc(exec.stack_size * sizeof(VARIANT)); + if(!exec.stack) + return E_OUTOFMEMORY; + exec.code = func->code_ctx; exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; @@ -152,11 +199,15 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func) hres = op_funcs[op](&exec); if(FAILED(hres)) { FIXME("Failed %08x\n", hres); + stack_popn(&exec, exec.top); break; } exec.instr += op_move[op]; } + assert(!exec.top); + heap_free(exec.stack); + return hres; }

1 0

Jacek Caban : vbscript: Added interp_string implementation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 2cbbf5717940088f610bc2c891cfe75c4ac1d66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbbf5717940088f610bc2c89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:56 2011 +0200 vbscript: Added interp_string implementation. --- dlls/vbscript/interp.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index df296fa..d060c51 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -162,8 +162,16 @@ static HRESULT interp_bool(exec_ctx_t *ctx) static HRESULT interp_string(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ctx->instr->arg1.str); + if(!V_BSTR(&v)) + return E_OUTOFMEMORY; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = {

1 0

Jacek Caban : vbscript: Added support for arguments in interp_icallv.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: e7f582e89c4613c9869afb85044573a3b981b243 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f582e89c4613c9869afb850… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:58:15 2011 +0200 vbscript: Added support for arguments in interp_icallv. --- dlls/vbscript/interp.c | 36 +++++++++++++++++++++++++++++------- 1 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d060c51..f5254c4 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -107,25 +107,46 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) +{ + dp->cArgs = arg_cnt; + dp->rgdispidNamedArgs = NULL; + dp->cNamedArgs = 0; + + if(arg_cnt) { + VARIANT tmp; + unsigned i; + + assert(ctx->top >= arg_cnt); + + for(i=1; i*2 <= arg_cnt; i++) { + tmp = ctx->stack[ctx->top-i]; + ctx->stack[ctx->top-i] = ctx->stack[ctx->top-arg_cnt+i-1]; + ctx->stack[ctx->top-arg_cnt+i-1] = tmp; + } + + dp->rgvarg = ctx->stack + ctx->top-arg_cnt; + }else { + dp->rgvarg = NULL; + } +} + static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; - DISPPARAMS dp = {0}; - ref_t ref; + ref_t ref = {0}; + DISPPARAMS dp; HRESULT hres; TRACE("\n"); - if(arg_cnt) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; - } - hres = lookup_identifier(ctx, identifier, &ref); if(FAILED(hres)) return hres; + vbstack_to_dp(ctx, arg_cnt, &dp); + switch(ref.type) { case REF_DISP: hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, NULL); @@ -137,6 +158,7 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return DISP_E_UNKNOWNNAME; } + stack_popn(ctx, arg_cnt); return S_OK; }

1 0