ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Make String_charAt generic.

This commit is contained in:
Piotr Caban 2009-07-12 19:50:50 +02:00 committed by Alexandre Julliard
parent 16b38c457d
commit 0fae85fc63
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dlls/jscript/string.c
View File

@ -271,26 +271,42 @@ static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS
static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp,
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{ {
StringInstance *strobj; const WCHAR *str;
BSTR str; DWORD length;
BSTR ret, val_str = NULL;
INT pos = 0; INT pos = 0;
HRESULT hres; HRESULT hres;
TRACE("\n"); TRACE("\n");
if(dispex->builtin_info->class != JSCLASS_STRING) { if(!is_class(dispex, JSCLASS_STRING)) {
FIXME("not string this not supported\n"); VARIANT this;
return E_NOTIMPL;
}
strobj = (StringInstance*)dispex; V_VT(&this) = VT_DISPATCH;
V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex);
hres = to_string(dispex->ctx, &this, ei, &val_str);
if(FAILED(hres))
return hres;
str = val_str;
length = SysStringLen(val_str);
}
else {
StringInstance *this = (StringInstance*)dispex;
str = this->str;
length = this->length;
}
if(arg_cnt(dp)) { if(arg_cnt(dp)) {
VARIANT num; VARIANT num;
hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &num); hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &num);
if(FAILED(hres)) if(FAILED(hres)) {
SysFreeString(val_str);
return hres; return hres;
}
if(V_VT(&num) == VT_I4) { if(V_VT(&num) == VT_I4) {
pos = V_I4(&num); pos = V_I4(&num);
@ -300,18 +316,22 @@ static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA
} }
} }
if(!retv) if(!retv) {
SysFreeString(val_str);
return S_OK; return S_OK;
}
if(0 <= pos && pos < strobj->length) if(0 <= pos && pos < length)
str = SysAllocStringLen(strobj->str+pos, 1); ret = SysAllocStringLen(str+pos, 1);
else else
str = SysAllocStringLen(NULL, 0); ret = SysAllocStringLen(NULL, 0);
if(!str) SysFreeString(val_str);
if(!ret) {
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
V_VT(retv) = VT_BSTR; V_VT(retv) = VT_BSTR;
V_BSTR(retv) = str; V_BSTR(retv) = ret;
return S_OK; return S_OK;
} }