Jacek Caban : vbscript: Added interp_gt implementation.

Alexandre Julliard julliard at winehq.org
Mon Sep 19 13:48:44 CDT 2011


Module: wine
Branch: master
Commit: 4df350bb221d31f3fdd6bda5eab872304441ca29
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4df350bb221d31f3fdd6bda5eab872304441ca29

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 19 14:07:31 2011 +0200

vbscript: Added interp_gt implementation.

---

 dlls/vbscript/interp.c       |   14 ++++++++++++--
 dlls/vbscript/tests/lang.vbs |    5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index e35a481..9f1ed2d 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -943,8 +943,18 @@ static HRESULT interp_nequal(exec_ctx_t *ctx)
 
 static HRESULT interp_gt(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 ? VARIANT_TRUE : VARIANT_FALSE;
+    return stack_push(ctx, &v);
 }
 
 static HRESULT interp_gteq(exec_ctx_t *ctx)
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 149c4a4..76ff346 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -119,6 +119,11 @@ 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 ?")
+Call ok(2 > 1, "! 2 > 1")
+Call ok(false > true, "! false < true")
+Call ok(0 > true, "! 0 > true")
+Call ok(not (true > 0), "true > 0")
+Call ok(not (0 > 1 = 1), "0 > 1 = 1")
 
 x = 3
 Call ok(2+2 = 4, "2+2 = " & (2+2))




More information about the wine-cvs mailing list