Piotr Caban : jscript: Make String_charCodeAt generic.
Alexandre Julliard
julliard at winehq.org
Mon Jul 13 07:56:36 CDT 2009
Module: wine
Branch: master
Commit: a9d7135eccdb26effa32b8edad218ac6e75d349d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9d7135eccdb26effa32b8edad218ac6e75d349d
Author: Piotr Caban <piotr.caban at gmail.com>
Date: Sun Jul 12 22:05:57 2009 +0200
jscript: Make String_charCodeAt generic.
---
dlls/jscript/string.c | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 4c83d68..b0185d9 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -340,30 +340,44 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP
VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp)
{
const WCHAR *str;
+ BSTR val_str = NULL;
DWORD length, idx = 0;
HRESULT hres;
TRACE("\n");
- if(dispex->builtin_info->class == JSCLASS_STRING) {
- StringInstance *string = (StringInstance*)dispex;
+ if(!is_class(dispex, JSCLASS_STRING)) {
+ VARIANT this;
- str = string->str;
- length = string->length;
- }else {
- FIXME("not string this not supported\n");
- return E_NOTIMPL;
+ 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) > 0) {
VARIANT v;
hres = to_integer(dispex->ctx, get_arg(dp, 0), ei, &v);
- if(FAILED(hres))
+ if(FAILED(hres)) {
+ SysFreeString(val_str);
return hres;
+ }
if(V_VT(&v) != VT_I4 || V_I4(&v) < 0 || V_I4(&v) >= length) {
if(retv) num_set_nan(&v);
+ SysFreeString(val_str);
return S_OK;
}
@@ -374,6 +388,8 @@ static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISP
V_VT(retv) = VT_I4;
V_I4(retv) = str[idx];
}
+
+ SysFreeString(val_str);
return S_OK;
}
More information about the wine-cvs
mailing list