commit 33a81218adc851966427b50f0c770751c9d33ec7
author Jacek Caban <jacek@codeweavers.com> Mon Sep 19 14:07:51 2011 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 19 17:59:56 2011 +0200
tree 0cc41771fe34a2a227986e3ffc275237e236da3d
parent ac5db68d02b2cbc1e7f7bd3c69424ffab206a6cb

vbscript: Added interp_lteq implementation.

dlls/vbscript/interp.c

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index a609056..d3c3483 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -991,8 +991,18 @@
 
 static HRESULT interp_lteq(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_LT || hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE;
+    return stack_push(ctx, &v);
 }
 
 static HRESULT interp_concat(exec_ctx_t *ctx)

dlls/vbscript/tests/lang.vbs

diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 699d78c..a63f9cf 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -126,6 +126,8 @@
 Call ok(not (0 > 1 = 1), "0 > 1 = 1")
 Call ok(1 < 2, "! 1 < 2")
 Call ok(1 = 1 < 0, "! 1 = 1 < 0")
+Call ok(1 <= 2, "! 1 <= 2")
+Call ok(2 <= 2, "! 2 <= 2")
 
 x = 3
 Call ok(2+2 = 4, "2+2 = " & (2+2))