Jacek Caban : vbscript: Added Right() implementation.
Alexandre Julliard
julliard at winehq.org
Mon Oct 1 13:35:06 CDT 2012
Module: wine
Branch: master
Commit: 50985fa2d3f0f59e9f55eac4d2f722dfb6444efd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=50985fa2d3f0f59e9f55eac4d2f722dfb6444efd
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Oct 1 13:00:09 2012 +0200
vbscript: Added Right() implementation.
---
dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++---
dlls/vbscript/tests/api.vbs | 10 ++++++++++
2 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 98eb047..fa600ee 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -676,10 +676,42 @@ static HRESULT Global_LeftB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR
return E_NOTIMPL;
}
-static HRESULT Global_Right(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
+static HRESULT Global_Right(vbdisp_t *This, VARIANT *args, unsigned args_cnt, VARIANT *res)
{
- FIXME("\n");
- return E_NOTIMPL;
+ BSTR str, ret, conv_str = NULL;
+ int len, str_len;
+ HRESULT hres;
+
+ TRACE("(%s %s)\n", debugstr_variant(args+1), debugstr_variant(args));
+
+ if(V_VT(args+1) == VT_BSTR) {
+ str = V_BSTR(args+1);
+ }else {
+ hres = to_string(args+1, &conv_str);
+ if(FAILED(hres))
+ return hres;
+ str = conv_str;
+ }
+
+ hres = to_int(args, &len);
+ if(FAILED(hres))
+ return hres;
+
+ if(len < 0) {
+ FIXME("len = %d\n", len);
+ return E_FAIL;
+ }
+
+ str_len = SysStringLen(str);
+ if(len > str_len)
+ len = str_len;
+
+ ret = SysAllocStringLen(str+str_len-len, len);
+ SysFreeString(conv_str);
+ if(!ret)
+ return E_OUTOFMEMORY;
+
+ return return_bstr(res, ret);
}
static HRESULT Global_RightB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs
index c6f8536..06122ef 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -215,6 +215,16 @@ TestLeft "test", 0, ""
TestLeft 123, 2, "12"
if isEnglishLang then TestLeft true, 2, "Tr"
+Sub TestRight(str, len, ex)
+ Call ok(Right(str, len) = ex, "Right(" & str & ", " & len & ") = " & Right(str, len))
+End Sub
+
+TestRight "test", 2, "st"
+TestRight "test", 5, "test"
+TestRight "test", 0, ""
+TestRight 123, 2, "23"
+if isEnglishLang then TestRight true, 2, "ue"
+
Sub TestRound(val, exval, vt)
Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val))
Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))
More information about the wine-cvs
mailing list