Jacek Caban : vbscript: Added interp_gteq implementation.
Module: wine Branch: master Commit: bce6d6ac8a4912b8a8794a783adf9023436c9535 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce6d6ac8a4912b8a8794a783a... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:07:22 2011 +0200 vbscript: Added interp_gteq implementation. --- dlls/vbscript/interp.c | 14 ++++++++++++-- dlls/vbscript/tests/lang.vbs | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 9a49396..e35a481 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -949,8 +949,18 @@ static HRESULT interp_gt(exec_ctx_t *ctx) static HRESULT interp_gteq(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = cmp_oper(ctx); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = hres == VARCMP_GT || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static HRESULT interp_lt(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index c62f17f..149c4a4 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -116,6 +116,10 @@ call ok(false imp false, "false does not imp false?") call ok(not (true imp false), "true imp false?") call ok(false imp null, "false imp null is false?") +Call ok(2 >= 1, "! 2 >= 1") +Call ok(2 >= 2, "! 2 >= 2") +Call ok(not(true >= 2), "true >= 2 ?") + x = 3 Call ok(2+2 = 4, "2+2 = " & (2+2)) Call ok(false + 6 + true = 5, "false + 6 + true <> 5")
participants (1)
-
Alexandre Julliard