Jacek Caban : vbscript: Added interp_concat implementation.

Alexandre Julliard julliard at winehq.org
Mon Sep 12 11:42:59 CDT 2011


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 12 12:30:57 2011 +0200

vbscript: Added interp_concat implementation.

---

 dlls/vbscript/interp.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 7ee58a2..90531fb 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -369,8 +369,26 @@ static HRESULT interp_equal(exec_ctx_t *ctx)
 
 static HRESULT interp_concat(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 = VarCat(l.v, r.v, &v);
+        release_val(&l);
+    }
+    release_val(&r);
+    if(FAILED(hres))
+        return hres;
+
+    return stack_push(ctx, &v);
 }
 
 static const instr_func_t op_funcs[] = {




More information about the wine-cvs mailing list