Module: wine Branch: master Commit: d0be36213a80c9257405771e8a88efe15b55b2fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0be36213a80c9257405771e8a...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Mar 26 11:54:54 2012 +0200
vbscript: Added parameterized member assignment statement implementation.
---
dlls/vbscript/interp.c | 7 +------ dlls/vbscript/tests/run.c | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 8cfec58..67e1070 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -682,11 +682,6 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx)
TRACE("%s\n", debugstr_w(identifier));
- if(arg_cnt) { - FIXME("arguments not supported\n"); - return E_NOTIMPL; - } - hres = stack_assume_disp(ctx, arg_cnt+1, &obj); if(FAILED(hres)) return hres; @@ -708,7 +703,7 @@ static HRESULT interp_assign_member(exec_ctx_t *ctx) if(FAILED(hres)) return hres;
- stack_popn(ctx, 2); + stack_popn(ctx, arg_cnt+2); return S_OK; }
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index fd64bfc..861ec7b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1288,6 +1288,12 @@ static void run_tests(void) CHECK_CALLED(global_propargput_d); CHECK_CALLED(global_propargput_i);
+ SET_EXPECT(global_propargput_d); + SET_EXPECT(global_propargput_i); + parse_script_a("test.propargput(counter(), counter()) = counter()"); + CHECK_CALLED(global_propargput_d); + CHECK_CALLED(global_propargput_i); + parse_script_a("x = 1\n Call ok(x = 1, "x = " & x)");
parse_script_a("x = _ \n3");