system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 11:49:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

jscript: Added String.concat implementation.

Browse source
This commit is contained in:
Jacek Caban 2008-09-21 15:44:13 +02:00 committed by Alexandre Julliard
parent 1f134b41b3
commit 6751644835
2 changed files with 60 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
dlls/jscript/string.c
View file

@ -241,11 +241,62 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP
return S_OK;
}
/* ECMA-262 3rd Edition 15.5.4.6 */
static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
FIXME("\n");
return E_NOTIMPL;
BSTR *strs = NULL, ret = NULL;
DWORD len = 0, i, l, str_cnt;
VARIANT var;
WCHAR *ptr;
HRESULT hres;
TRACE("\n");
str_cnt = arg_cnt(dp)+1;
strs = heap_alloc_zero(str_cnt * sizeof(BSTR));
if(!strs)
return E_OUTOFMEMORY;
V_VT(&var) = VT_DISPATCH;
V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(dispex);
hres = to_string(dispex->ctx, &var, ei, strs);
if(SUCCEEDED(hres)) {
for(i=0; i < arg_cnt(dp); i++) {
hres = to_string(dispex->ctx, get_arg(dp, i), ei, strs+i+1);
if(FAILED(hres))
break;
}
}
if(SUCCEEDED(hres)) {
for(i=0; i < str_cnt; i++)
len += SysStringLen(strs[i]);
ptr = ret = SysAllocStringLen(NULL, len);
for(i=0; i < str_cnt; i++) {
l = SysStringLen(strs[i]);
memcpy(ptr, strs[i], l*sizeof(WCHAR));
ptr += l;
}
}
for(i=0; i < str_cnt; i++)
SysFreeString(strs[i]);
heap_free(strs);
if(FAILED(hres))
return hres;
if(retv) {
V_VT(retv) = VT_BSTR;
V_BSTR(retv) = ret;
}else {
SysFreeString(ret);
}
return S_OK;
}
static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,

7
dlls/jscript/tests/api.js
View file

@ -133,6 +133,13 @@ ok(tmp === "abcd", "'abcd'.slice() = " + tmp);
tmp = "abcd".slice(1);
ok(tmp === "bcd", "'abcd'.slice(1) = " + tmp);
tmp = "abc".concat(["d",1],2,false);
ok(tmp === "abcd,12false", "concat returned " + tmp);
var arr = new Array(2,"a");
arr.concat = String.prototype.concat;
tmp = arr.concat("d");
ok(tmp === "2,ad", "arr.concat = " + tmp);
var arr = new Array();
ok(typeof(arr) === "object", "arr () is not object");
ok((arr.length === 0), "arr.length is not 0");