September 2011 - Wine-Commits

Jacek Caban : vbscript: Added support for exit do statement.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 9701bdb563046b1f7fa535882b4629c4b7417b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9701bdb563046b1f7fa535882… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:20 2011 +0200 vbscript: Added support for exit do statement. --- dlls/vbscript/compile.c | 31 ++++++++++++++++++++++++++++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 5 +++++ 4 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e29513b..61854e3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -38,6 +38,7 @@ typedef struct { unsigned labels_size; unsigned labels_cnt; + unsigned while_end_label; unsigned sub_end_label; unsigned func_end_label; unsigned prop_end_label; @@ -485,7 +486,7 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat) static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *stat) { - unsigned start_addr; + unsigned start_addr, prev_label; unsigned jmp_end; HRESULT hres; @@ -499,6 +500,12 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st if(jmp_end == -1) return E_OUTOFMEMORY; + if(stat->stat.type != STAT_WHILE) { + prev_label = ctx->while_end_label; + if((ctx->while_end_label = alloc_label(ctx)) == -1) + return E_OUTOFMEMORY; + } + hres = compile_statement(ctx, stat->body); if(FAILED(hres)) return hres; @@ -508,6 +515,12 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return hres; instr_ptr(ctx, jmp_end)->arg1.uint = ctx->instr_cnt; + + if(stat->stat.type != STAT_WHILE) { + label_set_addr(ctx, ctx->while_end_label); + ctx->while_end_label = prev_label; + } + return S_OK; } @@ -594,6 +607,16 @@ static HRESULT compile_function_statement(compile_ctx_t *ctx, function_statement return S_OK; } +static HRESULT compile_exitdo_statement(compile_ctx_t *ctx) +{ + if(ctx->while_end_label == -1) { + FIXME("Exit Do outside Do Loop\n"); + return E_FAIL; + } + + return push_instr_addr(ctx, OP_jmp, ctx->while_end_label); +} + static HRESULT compile_exitsub_statement(compile_ctx_t *ctx) { if(ctx->sub_end_label == -1) { @@ -639,6 +662,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_EXITDO: + hres = compile_exitdo_statement(ctx); + break; case STAT_EXITFUNC: hres = compile_exitfunc_statement(ctx); break; @@ -698,6 +724,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f func->code_off = ctx->instr_cnt; + ctx->while_end_label = -1; ctx->sub_end_label = -1; ctx->func_end_label = -1; ctx->prop_end_label = -1; @@ -732,6 +759,8 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f if(FAILED(hres)) return hres; + assert(ctx->while_end_label == -1); + if(ctx->sub_end_label != -1) label_set_addr(ctx, ctx->sub_end_label); if(ctx->func_end_label != -1) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index ff8c137..5e9c9ae 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -93,6 +93,7 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_EXITDO, STAT_EXITFUNC, STAT_EXITPROP, STAT_EXITSUB, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index c73f368..1bd8f58 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -159,6 +159,7 @@ Statement | tDO tWHILE Expression tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } + | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } | tEXIT tSUB { $$ = new_statement(ctx, STAT_EXITSUB, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index da1e5cb..78083e6 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -225,6 +225,11 @@ call ok((x and y), "x or y is false after while") do while false loop +do while true + exit do + ok false, "exit do didn't work" +loop + if false then Sub testsub x = true

1 0

Frédéric Delanoy : cmd: echo_mode has BOOL type instead of int.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: b3561bf82e8e8599797826c5c0b4b730c5af9b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3561bf82e8e8599797826c5c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 16 08:44:06 2011 +0200 cmd: echo_mode has BOOL type instead of int. --- programs/cmd/builtins.c | 7 ++++--- programs/cmd/wcmdmain.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1e3defa..9c16e8f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -50,7 +50,8 @@ struct env_stack *pushd_directories; extern HINSTANCE hinst; extern WCHAR inbuilt[][10]; -extern int echo_mode, verify_mode, defaultColor; +extern int verify_mode, defaultColor; +extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; @@ -876,11 +877,11 @@ void WCMD_echo (const WCHAR *command) { return; } if (lstrcmpiW(command, onW) == 0) { - echo_mode = 1; + echo_mode = TRUE; return; } if (lstrcmpiW(command, offW) == 0) { - echo_mode = 0; + echo_mode = FALSE; return; } WCMD_output_asis (command); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 02260e3..beca20e 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -86,7 +86,8 @@ const WCHAR externals[NUM_EXTERNALS][10] = { HINSTANCE hinst; DWORD errorlevel; -int echo_mode = 1, verify_mode = 0, defaultColor = 7; +int verify_mode = 0, defaultColor = 7; +BOOL echo_mode = TRUE; static int opt_c, opt_k, opt_s; const WCHAR newline[] = {'\r','\n','\0'}; static const WCHAR equalsW[] = {'=','\0'}; @@ -1233,7 +1234,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_LIST **cmdList) { WCHAR *cmd, *p, *redir; - int status, i, prev_echo_mode; + int status, i; DWORD count, creationDisposition; HANDLE h; WCHAR *whichcmd; @@ -1246,7 +1247,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE}; - BOOL piped = FALSE; + BOOL prev_echo_mode, piped = FALSE; WINE_TRACE("command on entry:%s (%p), with forVariable '%s'='%s'\n", wine_dbgstr_w(command), cmdList,

1 0

Jacek Caban : vbscript: Added class_initializer support.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 28bddf8dd1599b00ca571d01636711b8f23f350c URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bddf8dd1599b00ca571d016… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:25 2011 +0200 vbscript: Added class_initializer support. --- dlls/vbscript/compile.c | 12 ++++++++++++ dlls/vbscript/tests/lang.vbs | 4 ++++ dlls/vbscript/vbdisp.c | 12 ++++++++++++ dlls/vbscript/vbscript.h | 1 + 4 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index bcf7b52..00dfc50 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -893,6 +893,8 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) unsigned i; HRESULT hres; + static const WCHAR class_initializeW[] = {'c','l','a','s','s','_','i','n','i','t','i','a','l','i','z','e',0}; + if(lookup_dim_decls(ctx, class_decl->name) || lookup_funcs_name(ctx, class_decl->name) || lookup_class_name(ctx, class_decl->name)) { FIXME("%s: redefinition\n", debugstr_w(class_decl->name)); @@ -909,6 +911,7 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) class_desc->func_cnt = 1; /* always allocate slot for default getter */ class_desc->prop_cnt = 0; + class_desc->class_initialize_id = 0; for(func_decl = class_decl->funcs; func_decl; func_decl = func_decl->next) { for(func_prop_decl = func_decl; func_prop_decl; func_prop_decl = func_prop_decl->next_prop_func) { @@ -932,6 +935,15 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) } } + if(!strcmpiW(class_initializeW, func_decl->name)) { + if(func_decl->type != FUNC_SUB) { + FIXME("class initializer is not sub\n"); + return E_FAIL; + } + + class_desc->class_initialize_id = i; + } + hres = create_class_funcprop(ctx, func_decl, class_desc->funcs + (func_prop_decl ? 0 : i)); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 08f4736..46317b9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -465,6 +465,7 @@ obj.publicProp = 3 Call ok(obj.publicProp = 3, "obj.publicProp = " & obj.publicProp) obj.publicProp() = 3 +Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateProp()) Call obj.setPrivateProp(6) Call ok(obj.getPrivateProp = 6, "obj.getPrivateProp = " & obj.getPrivateProp) @@ -485,6 +486,9 @@ funcCalled = "" Call ok(obj = 3, "(x = obj) = " & obj) Call ok(funcCalled = "GetDefVal", "funcCalled = " & funcCalled) +Call obj.Class_Initialize +Call ok(obj.getPrivateProp() = true, "obj.getPrivateProp() = " & obj.getPrivateProp()) + x = (New testclass).publicProp reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5fa63c..e1386be 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -375,6 +375,18 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) vbdisp->ref = 1; vbdisp->desc = desc; + if(desc->class_initialize_id) { + DISPPARAMS dp = {0}; + HRESULT hres; + + hres = exec_script(desc->ctx, desc->funcs[desc->class_initialize_id].entries[VBDISP_CALLGET], + (IDispatch*)&vbdisp->IDispatchEx_iface, &dp, NULL); + if(FAILED(hres)) { + IDispatchEx_Release(&vbdisp->IDispatchEx_iface); + return hres; + } + } + *ret = vbdisp; return S_OK; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 37931db..270e223 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef struct { typedef struct _class_desc_t { const WCHAR *name; script_ctx_t *ctx; + unsigned class_initialize_id; unsigned func_cnt; vbdisp_funcprop_desc_t *funcs; unsigned prop_cnt;

1 0

Jacek Caban : vbscript: Added do while..loop statement implementation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 1f5c56d1a85c3508e6ba271479c572da8aaf35dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5c56d1a85c3508e6ba27147… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:09 2011 +0200 vbscript: Added do while..loop statement implementation. --- dlls/vbscript/compile.c | 1 + dlls/vbscript/parse.h | 3 ++- dlls/vbscript/parser.y | 2 ++ dlls/vbscript/tests/lang.vbs | 13 +++++++++++++ 4 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 814d9ea..e29513b 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -661,6 +661,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; break; case STAT_WHILE: + case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); break; default: diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index efd3d67..ff8c137 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -100,7 +100,8 @@ typedef enum { STAT_IF, STAT_SET, STAT_STOP, - STAT_WHILE + STAT_WHILE, + STAT_WHILELOOP } statement_type_t; typedef struct _statement_t { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index d06c84f..c73f368 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -156,6 +156,8 @@ Statement | IfStatement { $$ = $1; } | tWHILE Expression tNL StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } + | tDO tWHILE Expression tNL StatementsNl_opt tLOOP + { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } | tEXIT tPROPERTY { $$ = new_statement(ctx, STAT_EXITPROP, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d3886d6..da1e5cb 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -212,6 +212,19 @@ call ok((x and y), "x or y is false after while") while false wend +x = false +y = false +do while not (x and y) + if x then + y = true + end if + x = true +loop +call ok((x and y), "x or y is false after while") + +do while false +loop + if false then Sub testsub x = true

1 0

Frédéric Delanoy : cmd: Remove unused declarations of echo_mode.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: bf63385fabaabae68d74b1771673f93c9f5836b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf63385fabaabae68d74b1771… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 16 08:44:05 2011 +0200 cmd: Remove unused declarations of echo_mode. --- programs/cmd/batch.c | 1 - programs/cmd/directory.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 881c7d1..f988d95 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -24,7 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern int echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 1863690..0b5df04 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -33,8 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); - -extern int echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern DWORD errorlevel;

1 0

Jacek Caban : vbscript: Added GC implementation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: a99dc8cb3dc2ff90f894c746f17ea7b5d7e8c13f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99dc8cb3dc2ff90f894c746f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:29:47 2011 +0200 vbscript: Added GC implementation. --- dlls/vbscript/tests/run.c | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbdisp.c | 24 ++++++++++++++++++ dlls/vbscript/vbscript.c | 3 ++ dlls/vbscript/vbscript.h | 3 ++ 4 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 3fee711..9aba091 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -884,6 +884,8 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) hres = IActiveScriptParse64_ParseScriptText(parser, script_str, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + IActiveScript_Close(engine); + IDispatch_Release(script_disp); IActiveScript_Release(engine); IUnknown_Release(parser); @@ -907,6 +909,61 @@ static void parse_script_a(const char *src) parse_script_af(SCRIPTITEM_GLOBALMEMBERS, src); } +static void test_gc(void) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR src; + HRESULT hres; + + strict_dispid_check = FALSE; + + engine = create_script(); + if(!engine) + return; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse64_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_AddNamedItem(engine, testW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + src = a2bstr( + "class C\n" + " Public ref\n" + " Public Sub Class_Terminate\n" + " Call reportSuccess()\n" + " End Sub\n" + "End Class\n" + "Dim x\n" + "set x = new C\n" + "set x.ref = x\n" + "set x = nothing\n"); + + hres = IActiveScriptParse64_ParseScriptText(parser, src, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + SysFreeString(src); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + IActiveScript_Close(engine); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + IActiveScript_Release(engine); + IUnknown_Release(parser); +} + static BSTR get_script_from_file(const char *filename) { DWORD size, len; @@ -1041,6 +1098,8 @@ static void run_tests(void) CHECK_CALLED(testobj_propput_i); run_from_res("lang.vbs"); + + test_gc(); } static BOOL check_vbscript(void) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c948f13..c1eba23 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -144,6 +144,9 @@ static void clean_props(vbdisp_t *This) { unsigned i; + if(!This->desc) + return; + for(i=0; i < This->desc->prop_cnt; i++) VariantClear(This->props+i); } @@ -197,6 +200,7 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) run_terminator(This); if(!ref) { clean_props(This); + list_remove(&This->entry); heap_free(This); } @@ -247,6 +251,9 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + if(!This->desc) + return E_UNEXPECTED; + if(grfdex & ~(fdexNameEnsure|fdexNameCaseInsensitive)) { FIXME("unsupported flags %x\n", grfdex); return E_NOTIMPL; @@ -262,6 +269,9 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + if(!This->desc) + return E_UNEXPECTED; + if(pvarRes) V_VT(pvarRes) = VT_EMPTY; @@ -408,10 +418,24 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) } } + list_add_tail(&desc->ctx->objects, &vbdisp->entry); *ret = vbdisp; return S_OK; } +void collect_objects(script_ctx_t *ctx) +{ + vbdisp_t *iter, *iter2; + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &ctx->objects, vbdisp_t, entry) + run_terminator(iter); + + LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &ctx->objects, vbdisp_t, entry) { + clean_props(iter); + iter->desc = NULL; + } +} + HRESULT init_global(script_ctx_t *ctx) { ctx->script_desc.ctx = ctx; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index e0598a9..8074799 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -112,6 +112,8 @@ static HRESULT set_ctx_site(VBScript *This) static void destroy_script(script_ctx_t *ctx) { + collect_objects(ctx); + while(!list_empty(&ctx->code_list)) release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); @@ -509,6 +511,7 @@ static HRESULT WINAPI VBScriptParse_InitNew(IActiveScriptParse *iface) if(!ctx) return E_OUTOFMEMORY; + list_init(&ctx->objects); list_init(&ctx->code_list); list_init(&ctx->named_items); diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 5dd434a..a2c23ea 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -90,6 +90,7 @@ typedef struct { LONG ref; BOOL terminator_ran; + struct list entry; const class_desc_t *desc; VARIANT props[1]; @@ -99,6 +100,7 @@ HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*); +void collect_objects(script_ctx_t*); static inline unsigned arg_cnt(const DISPPARAMS *dp) { @@ -129,6 +131,7 @@ struct _script_ctx_t { function_t *global_funcs; class_desc_t *classes; + struct list objects; struct list code_list; struct list named_items; };

1 0

Jacek Caban : vbscript: Added do until..loop statement implementation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 223a407a7fd399a983d93b8ea10da821bb7f24b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=223a407a7fd399a983d93b8ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:31 2011 +0200 vbscript: Added do until..loop statement implementation. --- dlls/vbscript/compile.c | 3 ++- dlls/vbscript/interp.c | 25 +++++++++++++++++++++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 11 ++++++++--- dlls/vbscript/tests/lang.vbs | 18 ++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 6 files changed, 55 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 61854e3..5737676 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -496,7 +496,7 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st if(FAILED(hres)) return hres; - jmp_end = push_instr(ctx, OP_jmp_false); + jmp_end = push_instr(ctx, stat->stat.type == STAT_UNTIL ? OP_jmp_true : OP_jmp_false); if(jmp_end == -1) return E_OUTOFMEMORY; @@ -686,6 +686,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) case STAT_STOP: hres = push_instr(ctx, OP_stop) == -1 ? E_OUTOFMEMORY : S_OK; break; + case STAT_UNTIL: case STAT_WHILE: case STAT_WHILELOOP: hres = compile_while_statement(ctx, (while_statement_t*)stat); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 474957c..c8e0514 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -611,6 +611,31 @@ static HRESULT interp_jmp_false(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_jmp_true(exec_ctx_t *ctx) +{ + const unsigned arg = ctx->instr->arg1.uint; + variant_val_t val; + HRESULT hres; + + TRACE("%u\n", arg); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + if(V_VT(val.v) != VT_BOOL) { + FIXME("unsupported for %s\n", debugstr_variant(val.v)); + release_val(&val); + return E_NOTIMPL; + } + + if(V_BOOL(val.v)) + instr_jmp(ctx, ctx->instr->arg1.uint); + else + ctx->instr++; + return S_OK; +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 5e9c9ae..624e49f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -101,6 +101,7 @@ typedef enum { STAT_IF, STAT_SET, STAT_STOP, + STAT_UNTIL, STAT_WHILE, STAT_WHILELOOP } statement_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 1bd8f58..820ae6c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -114,7 +114,7 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u %type <expression> NotExpression UnaryExpression AndExpression OrExpression XorExpression EqvExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList -%type <bool> OptionExplicit_opt +%type <bool> OptionExplicit_opt DoType %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl %type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf @@ -156,8 +156,9 @@ Statement | IfStatement { $$ = $1; } | tWHILE Expression tNL StatementsNl_opt tWEND { $$ = new_while_statement(ctx, STAT_WHILE, $2, $4); CHECK_ERROR; } - | tDO tWHILE Expression tNL StatementsNl_opt tLOOP - { $$ = new_while_statement(ctx, STAT_WHILELOOP, $3, $5); CHECK_ERROR; } + | tDO DoType Expression tNL StatementsNl_opt tLOOP + { $$ = new_while_statement(ctx, $2 ? STAT_WHILELOOP : STAT_UNTIL, $3, $5); + CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } @@ -175,6 +176,10 @@ DimDeclList /* FIXME: Support arrays */ : tIdentifier { $$ = new_dim_decl(ctx, $1, NULL); CHECK_ERROR; } | tIdentifier ',' DimDeclList { $$ = new_dim_decl(ctx, $1, $3); CHECK_ERROR; } +DoType + : tWHILE { $$ = TRUE; } + | tUNTIL { $$ = FALSE; } + IfStatement : tIF Expression tTHEN tNL StatementsNl ElseIfs_opt Else_opt tEND tIF { $$ = new_if_statement(ctx, $2, $5, $6, $7); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 78083e6..8b1d1c3 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -230,6 +230,24 @@ do while true ok false, "exit do didn't work" loop +x = false +y = false +do until x and y + if x then + y = true + end if + x = true +loop +call ok((x and y), "x or y is false after do until") + +do until true +loop + +do until false + exit do + ok false, "exit do didn't work" +loop + if false then Sub testsub x = true diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a2c23ea..12315ae 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -167,6 +167,7 @@ typedef enum { X(imp, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ + X(jmp_true, 0, ARG_ADDR, 0) \ X(long, 1, ARG_INT, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \ X(mcallv, 1, ARG_BSTR, ARG_UINT) \

1 0

Jacek Caban : vbscript: Added do..while and do.. until statements implementation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 004210f1fb4abe85fd62a37a915696b66502a372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=004210f1fb4abe85fd62a37a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:30:39 2011 +0200 vbscript: Added do..while and do..until statements implementation. --- dlls/vbscript/compile.c | 34 +++++++++++++++++++++++++++++++++- dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 3 +++ dlls/vbscript/tests/lang.vbs | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5737676..1ff3c40 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -211,7 +211,7 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return NULL; ctx->code->bstr_pool_size = 8; }else if(ctx->code->bstr_pool_size == ctx->code->bstr_cnt) { - BSTR *new_pool; + BSTR *new_pool; new_pool = heap_realloc(ctx->code->bstr_pool, ctx->code->bstr_pool_size*2*sizeof(BSTR)); if(!new_pool) @@ -524,6 +524,34 @@ static HRESULT compile_while_statement(compile_ctx_t *ctx, while_statement_t *st return S_OK; } +static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t *stat) +{ + unsigned start_addr, prev_label; + HRESULT hres; + + start_addr = ctx->instr_cnt; + + prev_label = ctx->while_end_label; + if((ctx->while_end_label = alloc_label(ctx)) == -1) + return E_OUTOFMEMORY; + + hres = compile_statement(ctx, stat->body); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + hres = push_instr_addr(ctx, stat->stat.type == STAT_DOUNTIL ? OP_jmp_false : OP_jmp_true, start_addr); + if(FAILED(hres)) + return hres; + + label_set_addr(ctx, ctx->while_end_label); + ctx->while_end_label = prev_label; + return S_OK; +} + static HRESULT compile_assign_statement(compile_ctx_t *ctx, assign_statement_t *stat, BOOL is_set) { HRESULT hres; @@ -662,6 +690,10 @@ 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_DOWHILE: + case STAT_DOUNTIL: + hres = compile_dowhile_statement(ctx, (while_statement_t*)stat); + break; case STAT_EXITDO: hres = compile_exitdo_statement(ctx); break; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 624e49f..d121b72 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -93,6 +93,8 @@ typedef enum { STAT_ASSIGN, STAT_CALL, STAT_DIM, + STAT_DOUNTIL, + STAT_DOWHILE, STAT_EXITDO, STAT_EXITFUNC, STAT_EXITPROP, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 820ae6c..b1b385b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -159,6 +159,9 @@ Statement | tDO DoType Expression tNL StatementsNl_opt tLOOP { $$ = new_while_statement(ctx, $2 ? STAT_WHILELOOP : STAT_UNTIL, $3, $5); CHECK_ERROR; } + | tDO tNL StatementsNl_opt tLOOP DoType Expression + { $$ = new_while_statement(ctx, $5 ? STAT_DOWHILE : STAT_DOUNTIL, $6, $3); + CHECK_ERROR; } | FunctionDecl { $$ = new_function_statement(ctx, $1); CHECK_ERROR; } | tEXIT tDO { $$ = new_statement(ctx, STAT_EXITDO, 0); CHECK_ERROR; } | tEXIT tFUNCTION { $$ = new_statement(ctx, STAT_EXITFUNC, 0); CHECK_ERROR; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8b1d1c3..c62f17f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -248,6 +248,42 @@ do until false ok false, "exit do didn't work" loop +x = false +y = false +do + if x then + y = true + end if + x = true +loop until x and y +call ok((x and y), "x or y is false after while") + +do +loop until true + +do + exit do + ok false, "exit do didn't work" +loop until false + +x = false +y = false +do + if x then + y = true + end if + x = true +loop while not (x and y) +call ok((x and y), "x or y is false after while") + +do +loop while false + +do + exit do + ok false, "exit do didn't work" +loop while true + if false then Sub testsub x = true

1 0

Jacek Caban : vbscript: Added compiler/runtime support for property getters /letters.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 097a75f6744273a37bcb08d6fde71a2cafd882d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=097a75f6744273a37bcb08d6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:28:18 2011 +0200 vbscript: Added compiler/runtime support for property getters/letters. --- dlls/vbscript/compile.c | 34 ++++++++++++++++++++++++--- dlls/vbscript/interp.c | 13 +++++----- dlls/vbscript/tests/lang.vbs | 8 ++++++ dlls/vbscript/vbdisp.c | 52 +++++++++++++++++++++++++++++++++--------- dlls/vbscript/vbscript.h | 2 +- 5 files changed, 87 insertions(+), 22 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 015e775..6c30a40 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -813,16 +813,42 @@ static BOOL lookup_class_name(compile_ctx_t *ctx, const WCHAR *name) static HRESULT create_class_funcprop(compile_ctx_t *ctx, function_decl_t *func_decl, vbdisp_funcprop_desc_t *desc) { + vbdisp_invoke_type_t invoke_type; + function_decl_t *funcprop_decl; + HRESULT hres; + desc->name = compiler_alloc_string(ctx->code, func_decl->name); if(!desc->name) return E_OUTOFMEMORY; - assert(!desc->entries[0]); + for(funcprop_decl = func_decl; funcprop_decl; funcprop_decl = funcprop_decl->next_prop_func) { + switch(funcprop_decl->type) { + case FUNC_FUNCTION: + case FUNC_SUB: + case FUNC_PROPGET: + invoke_type = VBDISP_CALLGET; + break; + case FUNC_PROPLET: + invoke_type = VBDISP_LET; + break; + case FUNC_PROPSET: + invoke_type = VBDISP_SET; + break; + default: + assert(0); + } - if(func_decl->is_public) - desc->is_public = TRUE; + assert(!desc->entries[invoke_type]); - return create_function(ctx, func_decl, desc->entries); + if(funcprop_decl->is_public) + desc->is_public = TRUE; + + hres = create_function(ctx, funcprop_decl, desc->entries+invoke_type); + if(FAILED(hres)) + return hres; + } + + return S_OK; } static BOOL lookup_class_funcs(class_desc_t *class_desc, const WCHAR *name) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 27da9d3..7376d93 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -92,7 +92,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if(invoke_type == VBDISP_LET && ctx->func->type == FUNC_FUNCTION && !strcmpiW(name, ctx->func->name)) { + if(invoke_type == VBDISP_LET && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) + && !strcmpiW(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; return S_OK; @@ -114,7 +115,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - hres = disp_get_id(ctx->this_obj, name, TRUE, &id); + hres = disp_get_id(ctx->this_obj, name, invoke_type, TRUE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = ctx->this_obj; @@ -135,7 +136,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ LIST_FOR_EACH_ENTRY(item, &ctx->script->named_items, named_item_t, entry) { if((item->flags & SCRIPTITEM_GLOBALMEMBERS) && item->disp != ctx->this_obj) { - hres = disp_get_id(item->disp, name, FALSE, &id); + hres = disp_get_id(item->disp, name, invoke_type, FALSE, &id); if(SUCCEEDED(hres)) { ref->type = REF_DISP; ref->u.d.disp = item->disp; @@ -356,7 +357,7 @@ static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res) vbstack_to_dp(ctx, arg_cnt, &dp); - hres = disp_get_id(obj, identifier, FALSE, &id); + hres = disp_get_id(obj, identifier, VBDISP_CALLGET, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_call(ctx->script, obj, id, &dp, res); IDispatch_Release(obj); @@ -489,7 +490,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) return hres; } - hres = disp_get_id(obj, identifier, FALSE, &id); + hres = disp_get_id(obj, identifier, VBDISP_LET, FALSE, &id); if(SUCCEEDED(hres)) hres = disp_propput(ctx->script, obj, id, val.v); @@ -1204,7 +1205,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func, IDispatch *this_obj, DI } assert(!exec.top); - if(func->type != FUNC_FUNCTION) + if(func->type != FUNC_FUNCTION && func->type != FUNC_PROPGET) assert(V_VT(&exec.ret_val) == VT_EMPTY); if(SUCCEEDED(hres) && res) { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ac70b5f..2a1bbb0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -449,4 +449,12 @@ obj.publicProp() = 3 Call obj.setPrivateProp(6) Call ok(obj.getPrivateProp = 6, "obj.getPrivateProp = " & obj.getPrivateProp) +Dim funcCalled +funcCalled = "" +Call ok(obj.gsProp = 6, "obj.gsProp = " & obj.gsProp) +Call ok(funcCalled = "gsProp get", "funcCalled = " & funcCalled) +obj.gsProp = 3 +Call ok(funcCalled = "gsProp let", "funcCalled = " & funcCalled) +Call ok(obj.getPrivateProp = 3, "obj.getPrivateProp = " & obj.getPrivateProp) + reportSuccess() diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index e9bcb2a..a5fa63c 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -27,15 +27,21 @@ static inline BOOL is_func_id(vbdisp_t *This, DISPID id) return id < This->desc->func_cnt; } -static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, DISPID *id) +static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t invoke_type, BOOL search_private, DISPID *id) { unsigned i; - for(i = 0; i < This->desc->func_cnt; i++) { - if(!search_private && !This->desc->funcs[i].is_public) - continue; - if(!This->desc->funcs[i].name) /* default value may not exist */ - continue; + for(i = invoke_type == VBDISP_ANY ? 0 : 1; i < This->desc->func_cnt; i++) { + if(invoke_type == VBDISP_ANY) { + if(!search_private && !This->desc->funcs[i].is_public) + continue; + if(!i && !This->desc->funcs[0].name) /* default value may not exist */ + continue; + }else { + if(!This->desc->funcs[i].entries[invoke_type] + || (!search_private && !This->desc->funcs[i].entries[invoke_type]->is_public)) + continue; + } if(!strcmpiW(This->desc->funcs[i].name, name)) { *id = i; @@ -46,11 +52,11 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, BOOL search_private, return FALSE; } -HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, BOOL search_private, DISPID *id) +HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_type, BOOL search_private, DISPID *id) { unsigned i; - if(get_func_id(This, name, search_private, id)) + if(get_func_id(This, name, invoke_type, search_private, id)) return S_OK; for(i=0; i < This->desc->prop_cnt; i++) { @@ -225,7 +231,7 @@ static HRESULT WINAPI DispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_NOTIMPL; } - return vbdisp_get_id(This, bstrName, FALSE, pid); + return vbdisp_get_id(This, bstrName, VBDISP_ANY, FALSE, pid); } static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, @@ -254,6 +260,30 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc } return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, pdp, pvarRes); + case DISPATCH_PROPERTYPUT: { + VARIANT *put_val; + DISPPARAMS dp = {NULL, NULL, 1, 0}; + + if(arg_cnt(pdp)) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + + put_val = get_propput_arg(pdp); + if(!put_val) { + WARN("no value to set\n"); + return DISP_E_PARAMNOTOPTIONAL; + } + + dp.rgvarg = put_val; + func = This->desc->funcs[id].entries[V_VT(put_val) == VT_DISPATCH ? VBDISP_SET : VBDISP_LET]; + if(!func) { + FIXME("no letter/setter\n"); + return DISP_E_MEMBERNOTFOUND; + } + + return exec_script(This->desc->ctx, func, (IDispatch*)&This->IDispatchEx_iface, &dp, NULL); + } default: FIXME("flags %x\n", wFlags); return DISP_E_MEMBERNOTFOUND; @@ -355,7 +385,7 @@ HRESULT init_global(script_ctx_t *ctx) return create_vbdisp(&ctx->script_desc, &ctx->script_obj); } -HRESULT disp_get_id(IDispatch *disp, BSTR name, BOOL search_private, DISPID *id) +HRESULT disp_get_id(IDispatch *disp, BSTR name, vbdisp_invoke_type_t invoke_type, BOOL search_private, DISPID *id) { IDispatchEx *dispex; vbdisp_t *vbdisp; @@ -363,7 +393,7 @@ HRESULT disp_get_id(IDispatch *disp, BSTR name, BOOL search_private, DISPID *id) vbdisp = unsafe_impl_from_IDispatch(disp); if(vbdisp) - return vbdisp_get_id(vbdisp, name, search_private, id); + return vbdisp_get_id(vbdisp, name, invoke_type, search_private, id); hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); if(FAILED(hres)) { diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 7433293..37fc7dd 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -93,7 +93,7 @@ typedef struct { } vbdisp_t; HRESULT create_vbdisp(const class_desc_t*,vbdisp_t**); -HRESULT disp_get_id(IDispatch*,BSTR,BOOL,DISPID*); +HRESULT disp_get_id(IDispatch*,BSTR,vbdisp_invoke_type_t,BOOL,DISPID*); HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,DISPPARAMS*,VARIANT*); HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*);

1 0

Jacek Caban : vbscript: Added getters/setters parser implementation.
by Alexandre Julliard Sept. 16, 2011

Sept. 16, 2011

Module: wine Branch: master Commit: 32f336bd9dddc0d4331361b7043db68b6fa1ca39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f336bd9dddc0d4331361b70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 16 13:28:00 2011 +0200 vbscript: Added getters/setters parser implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 37 +++++++++++++++++++++++++++++++++---- dlls/vbscript/tests/lang.vbs | 14 ++++++++++++++ dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 14d2598..015e775 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -666,6 +666,10 @@ 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_PROPGET: + case FUNC_PROPLET: + case FUNC_PROPSET: + /* FIXME */ case FUNC_GLOBAL: break; } diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 63b2ded..6227e0c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -140,6 +140,7 @@ typedef struct _function_decl_t { arg_decl_t *args; statement_t *body; struct _function_decl_t *next; + struct _function_decl_t *next_prop_func; } function_decl_t; typedef struct { diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 5224c71..f67abd5 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -115,7 +115,7 @@ static class_decl_t *add_variant_prop(parser_ctx_t*,class_decl_t*,const WCHAR*,u %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt %type <arg_decl> ArgumentsDecl_opt ArgumentDeclList ArgumentDecl -%type <func_decl> FunctionDecl +%type <func_decl> FunctionDecl PropertyDecl %type <elseif> ElseIfs_opt ElseIfs ElseIf %type <class_decl> ClassDeclaration ClassBody %type <uint> Storage Storage_opt @@ -295,6 +295,15 @@ ClassBody : /* empty */ { $$ = new_class_decl(ctx); } | FunctionDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } | Storage tIdentifier tNL ClassBody { $$ = add_variant_prop(ctx, $4, $2, $1); CHECK_ERROR; } + | PropertyDecl tNL ClassBody { $$ = add_class_function(ctx, $3, $1); CHECK_ERROR; } + +PropertyDecl + : Storage_opt tPROPERTY tGET tIdentifier EmptyBrackets_opt tNL StatementsNl_opt tEND tPROPERTY + { $$ = new_function_decl(ctx, $4, FUNC_PROPGET, $1, NULL, $7); CHECK_ERROR; } + | Storage_opt tPROPERTY tLET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY + { $$ = new_function_decl(ctx, $4, FUNC_PROPLET, $1, $6, $9); CHECK_ERROR; } + | Storage_opt tPROPERTY tSET tIdentifier '(' ArgumentDecl ')' tNL StatementsNl_opt tEND tPROPERTY + { $$ = new_function_decl(ctx, $4, FUNC_PROPSET, $1, $6, $9); CHECK_ERROR; } FunctionDecl : Storage_opt tSUB tIdentifier ArgumentsDecl_opt tNL StatementsNl_opt tEND tSUB @@ -591,9 +600,14 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, function_decl_t *decl; if(storage_flags & STORAGE_IS_DEFAULT) { - FIXME("Function declared as default property\n"); - ctx->hres = E_FAIL; - return NULL; + if(type == FUNC_PROPGET) { + FIXME("default value not implemented\n"); + ctx->hres = E_NOTIMPL; + }else { + FIXME("Invalid default property\n"); + ctx->hres = E_FAIL; + return NULL; + } } decl = parser_alloc(ctx, sizeof(*decl)); @@ -606,6 +620,7 @@ static function_decl_t *new_function_decl(parser_ctx_t *ctx, const WCHAR *name, decl->args = arg_decl; decl->body = body; decl->next = NULL; + decl->next_prop_func = NULL; return decl; } @@ -646,6 +661,20 @@ static class_decl_t *add_class_function(parser_ctx_t *ctx, class_decl_t *class_d ctx->hres = E_FAIL; return NULL; } + + while(1) { + if(iter->type == decl->type) { + FIXME("Redefinition of %s::%s\n", debugstr_w(class_decl->name), debugstr_w(decl->name)); + ctx->hres = E_FAIL; + return NULL; + } + if(!iter->next_prop_func) + break; + iter = iter->next_prop_func; + } + + iter->next_prop_func = decl; + return class_decl; } } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index e29a20f..ac70b5f 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -399,11 +399,25 @@ Class TestClass publicFunction = 4 End Function + Public Property Get gsProp() + gsProp = privateProp + funcCalled = "gsProp get" + End Property + Public publicProp2 Public Sub publicSub End Sub + Public Property Let gsProp(val) + privateProp = val + funcCalled = "gsProp let" + End Property + + Public Property Set gsProp(val) + funcCalled = "gsProp set" + End Property + Public Sub setPrivateProp(x) privateProp = x End Sub diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ce1fa01..7433293 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -211,7 +211,10 @@ typedef struct { typedef enum { FUNC_GLOBAL, FUNC_FUNCTION, - FUNC_SUB + FUNC_SUB, + FUNC_PROPGET, + FUNC_PROPLET, + FUNC_PROPSET } function_type_t; typedef struct {

1 0