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

jscript: Make String_charCodeAt generic.

This commit is contained in:
Piotr Caban 2009-07-12 22:05:57 +02:00 committed by Alexandre Julliard
parent 0fae85fc63
commit a9d7135ecc
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/jscript/string.c
View File

@ -340,30 +340,44 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{ {
const WCHAR *str; const WCHAR *str;
BSTR val_str = NULL;
DWORD length, idx = 0; DWORD length, idx = 0;
HRESULT hres; HRESULT hres;
TRACE("\n"); TRACE("\n");
if(dispex->builtin_info->class == JSCLASS_STRING) { if(!is_class(dispex, JSCLASS_STRING)) {
StringInstance *string = (StringInstance*)dispex; VARIANT this;
str = string->str; V_VT(&this) = VT_DISPATCH;
length = string->length; V_DISPATCH(&this) = (IDispatch*)_IDispatchEx_(dispex);
}else {
FIXME("not string this not supported\n"); hres = to_string(dispex->ctx, &this, ei, &val_str);
return E_NOTIMPL; 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) > 0) { if(arg_cnt(dp) > 0) {
VARIANT v; VARIANT v;
hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &v); hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &v);
if(FAILED(hres)) if(FAILED(hres)) {
SysFreeString(val_str);
return hres; return hres;
}
if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) { if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) {
if(retv) num_set_nan(&v); if(retv) num_set_nan(&v);
SysFreeString(val_str);
return S_OK; return S_OK;
} }
@ -374,6 +388,8 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP
V_VT(retv) = VT_I4; V_VT(retv) = VT_I4;
V_I4(retv) = str[idx]; V_I4(retv) = str[idx];
} }
SysFreeString(val_str);
return S_OK; return S_OK;
} }