September 2011 - Wine-commits

Frédéric Delanoy : cmd: Clarify WCMD_if function.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 191056ad5cab8e309ba793bd09d55e0a2b417435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191056ad5cab8e309ba793bd0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:42 2011 +0200 cmd: Clarify WCMD_if function. --- programs/cmd/builtins.c | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1320b32..35797f1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1497,7 +1497,8 @@ void WCMD_popd (void) { void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { - int negate = 0, test = 0; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ WCHAR condition[MAX_PATH], *command, *s; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; @@ -1505,40 +1506,28 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; static const WCHAR eqeqW[] = {'=','=','\0'}; static const WCHAR parmI[] = {'/','I','\0'}; + int caseInsensitive = (strstrW(quals, parmI) != NULL); - if (!lstrcmpiW (param1, notW)) { - negate = 1; - strcpyW (condition, param2); - } - else { - strcpyW (condition, param1); - } + negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - if (errorlevel >= atoiW(WCMD_parameter (p, 1+negate, NULL))) test = 1; + test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL))); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, existW)) { - if (GetFileAttributesW(WCMD_parameter (p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES) { - test = 1; - } + test = (GetFileAttributesW(WCMD_parameter(p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, defdW)) { - if (GetEnvironmentVariableW(WCMD_parameter (p, 1+negate, NULL), NULL, 0) > 0) { - test = 1; - } + test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL), NULL, 0) > 0); WCMD_parameter (p, 2+negate, &command); } else if ((s = strstrW (p, eqeqW))) { s += 2; - if (strstrW (quals, parmI) == NULL) { - if (!lstrcmpW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } - else { - if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } + test = caseInsensitive ? (!lstrcmpiW(condition, WCMD_parameter(s, 0, NULL))) + : (!lstrcmpW (condition, WCMD_parameter(s, 0, NULL))); WCMD_parameter (s, 1, &command); } else {

1 0

Frédéric Delanoy : cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param , if requested.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 3627c289585466b1cb04601339de0d3da55becc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3627c289585466b1cb0460133… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:43 2011 +0200 cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param, if requested. --- programs/cmd/batch.c | 12 ++++++++---- programs/cmd/builtins.c | 34 +++++++++++++++++----------------- programs/cmd/directory.c | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 +++++----- 5 files changed, 32 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3627c289585466b1cb046…

1 0

Frédéric Delanoy : cmd: Fix IF operands parsing for '==' operator.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 712276c7bf561ae3bf34e851c1d794568cd5b8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=712276c7bf561ae3bf34e851c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:44 2011 +0200 cmd: Fix IF operands parsing for '==' operator. --- programs/cmd/builtins.c | 13 +++++++++++-- programs/cmd/tests/test_builtins.cmd.exp | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9dbeb93..9c4f72a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1525,9 +1525,18 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WCMD_parameter(p, 2+negate, &command, NULL); } else if ((s = strstrW (p, eqeqW))) { + /* We need to get potential surrounding double quotes, so param1/2 can't be used */ + WCHAR *leftPart, *leftPartEnd, *rightPart, *rightPartEnd; s += 2; - test = caseInsensitive ? (!lstrcmpiW(condition, WCMD_parameter(s, 0, NULL, NULL))) - : (!lstrcmpW (condition, WCMD_parameter(s, 0, NULL, NULL))); + WCMD_parameter(p, 0+negate+caseInsensitive, &leftPart, &leftPartEnd); + WCMD_parameter(p, 1+negate+caseInsensitive, &rightPart, &rightPartEnd); + test = caseInsensitive + ? (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + leftPart, leftPartEnd-leftPart+1, + rightPart, rightPartEnd-rightPart+1) == CSTR_EQUAL) + : (CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, + leftPart, leftPartEnd-leftPart+1, + rightPart, rightPartEnd-rightPart+1) == CSTR_EQUAL); WCMD_parameter(s, 1, &command, NULL); } else { diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 514a635..90dfb45 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -382,15 +382,15 @@ NUL if/else should work with blocks if seems to work else seems to work -(a)todo_wine@if seems not to detect /c as parameter +if seems not to detect /c as parameter Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work Testing string comparisons equal -(a)todo_wine@non equal -(a)todo_wine@non equal +non equal +non equal equal Testing tabs handling doom

1 0

Francois Gouget : attrib: Make ATTRIB_wprintf() static.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: f720ccdc282d5937d91d423b8d163d78079bee84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f720ccdc282d5937d91d423b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 8 12:18:04 2011 +0200 attrib: Make ATTRIB_wprintf() static. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 33bf3c4..0ca64c3 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -45,7 +45,7 @@ static WCHAR *ATTRIB_LoadMessage(UINT id) { * and hence required WriteConsoleW to output it, however if file i/o is * redirected, it needs to be WriteFile'd using OEM (not ANSI) format * ========================================================================= */ -int ATTRIB_wprintf(const WCHAR *format, ...) { +static int ATTRIB_wprintf(const WCHAR *format, ...) { static WCHAR *output_bufW = NULL; static char *output_bufA = NULL;

1 0

Jacek Caban : vbscript: Store call identifier as BSTR.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 060255d0841d517c6cc48ccaadf6bca4e4a8c2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=060255d0841d517c6cc48ccaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:54:23 2011 +0200 vbscript: Store call identifier as BSTR. --- dlls/vbscript/Makefile.in | 1 + dlls/vbscript/compile.c | 47 ++++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 10 +++++++- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/Makefile.in b/dlls/vbscript/Makefile.in index 9e27dd4..cd7e18d 100644 --- a/dlls/vbscript/Makefile.in +++ b/dlls/vbscript/Makefile.in @@ -1,4 +1,5 @@ MODULE = vbscript.dll +IMPORTS = oleaut32 C_SRCS = \ compile.c \ diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index d57abcf..49d933b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -59,15 +59,45 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) return ctx->instr_cnt++; } -static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) +{ + if(!ctx->code->bstr_pool_size) { + ctx->code->bstr_pool = heap_alloc(8 * sizeof(BSTR)); + if(!ctx->code->bstr_pool) + return NULL; + ctx->code->bstr_pool_size = 8; + }else if(ctx->code->bstr_pool_size == ctx->code->bstr_cnt) { + BSTR *new_pool; + + new_pool = heap_realloc(ctx->code->bstr_pool, ctx->code->bstr_pool_size*2*sizeof(BSTR)); + if(!new_pool) + return NULL; + + ctx->code->bstr_pool = new_pool; + ctx->code->bstr_pool_size *= 2; + } + + ctx->code->bstr_pool[ctx->code->bstr_cnt] = SysAllocString(str); + if(!ctx->code->bstr_pool[ctx->code->bstr_cnt]) + return NULL; + + return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; +} + +static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) { unsigned instr; + BSTR bstr; + + bstr = alloc_bstr_arg(ctx, arg); + if(!bstr) + return E_OUTOFMEMORY; instr = push_instr(ctx, op); if(instr == -1) return E_OUTOFMEMORY; - instr_ptr(ctx, instr)->arg1.str = arg; + instr_ptr(ctx, instr)->arg1.bstr = bstr; return S_OK; } @@ -84,7 +114,7 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t FIXME("obj_expr not implemented\n"); hres = E_NOTIMPL; }else { - hres = push_instr_str(ctx, OP_icallv, expr->identifier); + hres = push_instr_bstr(ctx, OP_icallv, expr->identifier); } return hres; @@ -130,7 +160,14 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f void release_vbscode(vbscode_t *code) { + unsigned i; + list_remove(&code->entry); + + for(i=0; i < code->bstr_cnt; i++) + SysFreeString(code->bstr_pool[i]); + + heap_free(code->bstr_pool); heap_free(code->source); heap_free(code->instrs); heap_free(code); @@ -159,6 +196,10 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 0; ctx->instr_size = 32; + ret->bstr_pool = NULL; + ret->bstr_pool_size = 0; + ret->bstr_cnt = 0; + ret->global_code.code_ctx = ret; list_init(&ret->entry); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index bca630a..9942ac7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -64,11 +64,12 @@ HRESULT init_global(script_ctx_t*); typedef enum { ARG_NONE = 0, - ARG_STR + ARG_STR, + ARG_BSTR } instr_arg_type_t; #define OP_LIST \ - X(icallv, 1, ARG_STR, 0) \ + X(icallv, 1, ARG_BSTR, 0) \ X(ret, 0, 0, 0) typedef enum { @@ -80,6 +81,7 @@ OP_LIST typedef union { const WCHAR *str; + BSTR bstr; } instr_arg_t; typedef struct { @@ -100,6 +102,10 @@ struct _vbscode_t { BOOL global_executed; function_t global_code; + BSTR *bstr_pool; + unsigned bstr_pool_size; + unsigned bstr_cnt; + struct list entry; };

1 0

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

08 Sep '11

Module: wine Branch: master Commit: 9d7552205c5aa43c42db252b3f62eb6ca8d460be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7552205c5aa43c42db252b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:54:37 2011 +0200 vbscript: Added interp_icallv implementation. --- dlls/vbscript/interp.c | 67 +++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbdisp.c | 43 ++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 8 ++++- dlls/vbscript/vbscript_main.c | 2 + 4 files changed, 115 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 3ff6bbd..b309397 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -28,15 +28,75 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); typedef struct { vbscode_t *code; instr_t *instr; + script_ctx_t *script; } exec_ctx_t; - typedef HRESULT (*instr_func_t)(exec_ctx_t*); +typedef enum { + REF_NONE, + REF_DISP +} ref_type_t; + +typedef struct { + ref_type_t type; + union { + struct { + IDispatch *disp; + DISPID id; + } d; + } u; +} ref_t; + +static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) +{ + named_item_t *item; + DISPID id; + HRESULT hres; + + LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { + if(item->flags & SCRIPTITEM_GLOBALMEMBERS) { + hres = disp_get_id(item->disp, name, &id); + if(SUCCEEDED(hres)) { + ref->type = REF_DISP; + ref->u.d.disp = item->disp; + ref->u.d.id = id; + return S_OK; + } + } + } + + FIXME("create if no option explicit\n"); + + ref->type = REF_NONE; + return S_OK; +} + static HRESULT interp_icallv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + BSTR identifier = ctx->instr->arg1.bstr; + DISPPARAMS dp = {0}; + ref_t ref; + HRESULT hres; + + TRACE("\n"); + + hres = lookup_identifier(ctx, identifier, &ref); + if(FAILED(hres)) + return hres; + + switch(ref.type) { + case REF_DISP: + hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, NULL); + if(FAILED(hres)) + return hres; + break; + default: + FIXME("%s not found\n", debugstr_w(identifier)); + return DISP_E_UNKNOWNNAME; + } + + return S_OK; } static HRESULT interp_ret(exec_ctx_t *ctx) @@ -67,6 +127,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; while(exec.instr) { op = exec.instr->op; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 3c81789..c115199 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -203,3 +203,46 @@ HRESULT init_global(script_ctx_t *ctx) { return create_vbdisp(&ctx->script_obj); } + +HRESULT disp_get_id(IDispatch *disp, BSTR name, DISPID *id) +{ + IDispatchEx *dispex; + HRESULT hres; + + if(disp->lpVtbl == (IDispatchVtbl*)&DispatchExVtbl) + FIXME("properly handle builtin objects\n"); + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + TRACE("unsing IDispatch\n"); + return IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + } + + hres = IDispatchEx_GetDispID(dispex, name, fdexNameCaseInsensitive, id); + IDispatchEx_Release(dispex); + return hres; +} + +HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, DISPPARAMS *dp, VARIANT *retv) +{ + const WORD flags = DISPATCH_METHOD|(retv ? DISPATCH_PROPERTYGET : 0); + IDispatchEx *dispex; + EXCEPINFO ei; + HRESULT hres; + + memset(&ei, 0, sizeof(ei)); + if(retv) + V_VT(retv) = VT_EMPTY; + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if(FAILED(hres)) { + UINT err = 0; + + TRACE("using IDispatch\n"); + return IDispatch_Invoke(disp, id, &IID_NULL, ctx->lcid, flags, dp, retv, &ei, &err); + } + + hres = IDispatchEx_InvokeEx(dispex, id, ctx->lcid, flags, dp, retv, &ei, NULL /* CALLER_FIXME */); + IDispatchEx_Release(dispex); + return hres; +} diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9942ac7..8aca01c 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -33,6 +33,7 @@ typedef struct _function_t function_t; typedef struct _vbscode_t vbscode_t; +typedef struct _script_ctx_t script_ctx_t; typedef struct named_item_t { IDispatch *disp; @@ -48,7 +49,10 @@ typedef struct { LONG ref; } vbdisp_t; -typedef struct { +HRESULT disp_get_id(IDispatch*,BSTR,DISPID*); +HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); + +struct _script_ctx_t { IActiveScriptSite *site; LCID lcid; @@ -58,7 +62,7 @@ typedef struct { struct list code_list; struct list named_items; -} script_ctx_t; +}; HRESULT init_global(script_ctx_t*); diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index fc31aed..9d74026 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static HINSTANCE vbscript_hinstance; static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)

1 0

Jacek Caban : vbscript: Added simple call test.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 6e749ba5dc02052eea066bd90fe9aa3293a65171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e749ba5dc02052eea066bd90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:54:51 2011 +0200 vbscript: Added simple call test. --- dlls/vbscript/tests/run.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index d61b81f..4f70224 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -463,6 +463,12 @@ static void run_tests(void) parse_script_a(""); parse_script_a("' empty ;"); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("reportSuccess"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Added support for a few more characters in lexer.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 1ac1ffba11104fced99ce0bd6d5f5b4d0f61e39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac1ffba11104fced99ce0bd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:55:14 2011 +0200 vbscript: Added support for a few more characters in lexer. --- dlls/vbscript/lex.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index d481e6a..d41c582 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -76,6 +76,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) else ctx->ptr = ctx->end; return tNL; + case '(': + case ')': + case ',': + case '=': + case '+': + case '-': + case '*': + case '/': + case '^': + case '\\': + case '.': + return *ctx->ptr++; default: FIXME("Unhandled char %c in %s\n", *ctx->ptr, debugstr_w(ctx->ptr)); }

1 0

Jacek Caban : vbscript: Better function call parsing.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 69dcc641dfbc14066a9faa55c643e4bf2f6e7758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69dcc641dfbc14066a9faa55c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:55:35 2011 +0200 vbscript: Better function call parsing. --- dlls/vbscript/parser.y | 16 ++++++++++++++-- dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5fb6bd2..d5c7d40 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -39,6 +39,8 @@ static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,co static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); +#define CHECK_ERROR if(((parser_ctx_t*)ctx)->hres != S_OK) YYABORT + %} %pure_parser @@ -47,6 +49,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %union { const WCHAR *string; statement_t *statement; + expression_t *expression; member_expression_t *member; } @@ -55,6 +58,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <member> MemberExpression +%type <expression> Arguments_opt ArgumentList_opt %% @@ -69,12 +73,20 @@ StatementNl : Statement tNL { $$ = $1; } Statement - : MemberExpression /* FIXME: Arguments_opt */ { $$ = new_call_statement(ctx, $1); } + : MemberExpression Arguments_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } MemberExpression - : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); } + : tIdentifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } /* FIXME: MemberExpressionArgs '.' tIdentifier */ +Arguments_opt + : /* empty */ { $$ = NULL; } + | '(' ArgumentList_opt ')' { $$ = $2; } + +ArgumentList_opt + : /* empty */ { $$ = NULL; } + /* | ArgumentList { $$ = $1; } */ + %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 4f70224..9b1abd4 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -469,6 +469,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("reportSuccess()"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); } static BOOL check_vbscript(void)

1 0

Jacek Caban : vbscript: Added support for call keyword in lexer.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: b6e9a83d781e33b261fa880ef78a85025449913c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e9a83d781e33b261fa880ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:55:51 2011 +0200 vbscript: Added support for call keyword in lexer. --- dlls/vbscript/lex.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/parser.y | 1 + 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index d41c582..af01220 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -26,11 +26,61 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static const WCHAR callW[] = {'c','a','l','l',0}; + +static const struct { + const WCHAR *word; + int token; +} keywords[] = { + {callW, tCALL} +}; + static inline BOOL is_identifier_char(WCHAR c) { return isalnumW(c) || c == '_'; } +static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) +{ + const WCHAR *p1 = ctx->ptr; + const WCHAR *p2 = word; + WCHAR c; + + while(p1 < ctx->end && *p2) { + c = tolowerW(*p1); + if(c != *p2) + return c - *p2; + p1++; + p2++; + } + + if(*p2 || (p1 < ctx->end && is_identifier_char(*p1))) + return 1; + + ctx->ptr = p1; + return 0; +} + +static int check_keywords(parser_ctx_t *ctx) +{ + int min = 0, max = sizeof(keywords)/sizeof(keywords[0])-1, r, i; + + while(min <= max) { + i = (min+max)/2; + + r = check_keyword(ctx, keywords[i].word); + if(!r) + return keywords[i].token; + + if(r > 0) + min = i+1; + else + max = i-1; + } + + return 0; +} + static int parse_identifier(parser_ctx_t *ctx, const WCHAR **ret) { const WCHAR *ptr = ctx->ptr++; @@ -62,8 +112,12 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) c = *ctx->ptr; - if(isalphaW(c)) - return parse_identifier(ctx, lval); + if(isalphaW(c)) { + int ret = check_keywords(ctx); + if(!ret) + return parse_identifier(ctx, lval); + return ret; + } switch(c) { case '\n': diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d5c7d40..447aa12 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -54,6 +54,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); } %token tEOF tNL blah +%token tCALL %token <string> tIdentifier %type <statement> Statement StatementNl

1 0