Module: wine Branch: master Commit: 091f243051c80906f40edf544b0b1fab1f8a94fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=091f243051c80906f40edf544b...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Sep 14 12:59:14 2011 +0200
vbscript: Added interp_and 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 5b57306..d5e0370 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -566,8 +566,26 @@ static HRESULT interp_not(exec_ctx_t *ctx)
static HRESULT interp_and(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 = VarAnd(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); }
static HRESULT cmp_oper(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 10f03f0..69aeade 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -86,6 +86,11 @@ if(isEnglishLocale) then Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) end if
+call ok(true and true, "true and true is not true") +call ok(true and not false, "true and not false is not true") +call ok(not (false and true), "not (false and true) is not true") +call ok(getVT(null and true) = "VT_NULL", "getVT(null and true) = " & getVT(null and true)) + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")