Module: wine Branch: master Commit: 324aadd2a95fa4766b0e47caf7d38c5eb68dcb61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=324aadd2a95fa4766b0e47caf7...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Sep 12 12:32:18 2011 +0200
vbscript: Added interp_sub implementation.
---
dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f3e3f56..4585f88 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -417,8 +417,26 @@ static HRESULT interp_add(exec_ctx_t *ctx)
static HRESULT interp_sub(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarSub(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); }
static HRESULT interp_neg(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 06a3d07..9c37bb2 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -75,4 +75,9 @@ Call ok(false + 6 + true = 5, "false + 6 + true <> 5") Call ok(getVT(2+null) = "VT_NULL", "getVT(2+null) = " & getVT(2+null)) Call ok(2+empty = 2, "2+empty = " & (2+empty))
+Call ok(5-1 = 4, "5-1 = " & (5-1)) +Call ok(3+5-true = 9, "3+5-true <> 9") +Call ok(getVT(2-null) = "VT_NULL", "getVT(2-null) = " & getVT(2-null)) +Call ok(2-empty = 2, "2-empty = " & (2-empty)) + reportSuccess()