Jacek Caban : vbscript: Added interp_div implementation.
Alexandre Julliard
julliard at winehq.org
Tue Sep 13 12:18:10 CDT 2011
Module: wine
Branch: master
Commit: 9db2d7c352de98a99adee48158e5cddd861afaad
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db2d7c352de98a99adee48158e5cddd861afaad
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Sep 13 11:41:03 2011 +0200
vbscript: Added interp_div 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 ace9c7c..7a5be72 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -692,8 +692,26 @@ static HRESULT interp_idiv(exec_ctx_t *ctx)
static HRESULT interp_div(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 = VarDiv(l.v, r.v, &v);
+ release_val(&l);
+ }
+ release_val(&r);
+ if(FAILED(hres))
+ return hres;
+
+ return stack_push(ctx, &v);
}
static HRESULT interp_mul(exec_ctx_t *ctx)
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index b6330b2..661e2c9 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -111,6 +111,11 @@ Call ok(4.6 \ 1.5 = 2, "4.6 \ 1.5 = " & (4.6\1.5))
Call ok(4.6 \ 1.49 = 5, "4.6 \ 1.49 = " & (4.6\1.49))
Call ok(2+3\4 = 2, "2+3\4 = " & (2+3\4))
+Call ok(2*3 = 6, "2*3 = " & (2*3))
+Call ok(3/2 = 1.5, "3/2 = " & (3/2))
+Call ok(5\4/2 = 2, "5\4/2 = " & (5\2/1))
+Call ok(12/3\2 = 2, "12/3\2 = " & (12/3\2))
+
if false then
ok false, "if false called"
end if
More information about the wine-cvs
mailing list