From 8482abe29ccdd2f39f6918c5dc8272a4d0de832e Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 10 Sep 2008 02:33:37 +0200 Subject: [PATCH] jscript: Added String constructor object. --- dlls/jscript/Makefile.in | 3 +- dlls/jscript/global.c | 9 +- dlls/jscript/jscript.h | 5 +- dlls/jscript/string.c | 421 +++++++++++++++++++++++++++++++++++++ dlls/jscript/tests/lang.js | 1 + 5 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 dlls/jscript/string.c diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 183a09e08ac..7a42a015851 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -16,7 +16,8 @@ C_SRCS = \ jscript_main.c \ jsutils.c \ lex.c \ - object.c + object.c \ + string.c IDL_TLB_SRCS = jsglobal.idl diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 5ed7d1d1218..ed73defd70a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -125,8 +125,9 @@ static HRESULT JSGlobal_Object(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA static HRESULT JSGlobal_String(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + return constructor_call(dispex->ctx->string_constr, lcid, flags, dp, retv, ei, sp); } static HRESULT JSGlobal_RegExp(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, @@ -301,6 +302,10 @@ static HRESULT init_constructors(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_string_constr(ctx, &ctx->string_constr); + if(FAILED(hres)) + return hres; + return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0deafc9e55e..9305aef8c80 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -51,7 +51,8 @@ typedef enum { JSCLASS_NONE, JSCLASS_FUNCTION, JSCLASS_GLOBAL, - JSCLASS_OBJECT + JSCLASS_OBJECT, + JSCLASS_STRING } jsclass_t; typedef HRESULT (*builtin_invoke_t)(DispatchEx*,LCID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*); @@ -128,6 +129,7 @@ struct _script_ctx_t { DispatchEx *script_disp; DispatchEx *global; DispatchEx *object_constr; + DispatchEx *string_constr; }; void script_release(script_ctx_t*); @@ -140,6 +142,7 @@ static inline void script_addref(script_ctx_t *ctx) HRESULT init_global(script_ctx_t*); HRESULT create_object_constr(script_ctx_t*,DispatchEx**); +HRESULT create_string_constr(script_ctx_t*,DispatchEx**); const char *debugstr_variant(const VARIANT*); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c new file mode 100644 index 00000000000..26623ca7fdb --- /dev/null +++ b/dlls/jscript/string.c @@ -0,0 +1,421 @@ +/* + * Copyright 2008 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +typedef struct { + DispatchEx dispex; +} StringInstance; + +static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; +static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; +static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0}; +static const WCHAR anchorW[] = {'a','n','c','h','o','r',0}; +static const WCHAR bigW[] = {'b','i','g',0}; +static const WCHAR blinkW[] = {'b','l','i','n','k',0}; +static const WCHAR boldW[] = {'b','o','l','d',0}; +static const WCHAR charAtW[] = {'c','h','a','r','A','t',0}; +static const WCHAR charCodeAtW[] = {'c','h','a','r','C','o','d','e','A','t',0}; +static const WCHAR concatW[] = {'c','o','n','c','a','t',0}; +static const WCHAR fixedW[] = {'f','i','x','e','d',0}; +static const WCHAR fontcolorW[] = {'f','o','n','t','c','o','l','o','r',0}; +static const WCHAR fontsizeW[] = {'f','o','n','t','s','i','z','e',0}; +static const WCHAR indexOfW[] = {'i','n','d','e','x','O','f',0}; +static const WCHAR italicsW[] = {'i','t','a','l','i','c','s',0}; +static const WCHAR lastIndexOfW[] = {'l','a','s','t','I','n','d','e','x','O','f',0}; +static const WCHAR linkW[] = {'l','i','n','k',0}; +static const WCHAR matchW[] = {'m','a','t','c','h',0}; +static const WCHAR replaceW[] = {'r','e','p','l','a','c','e',0}; +static const WCHAR searchW[] = {'s','e','a','r','c','h',0}; +static const WCHAR sliceW[] = {'s','l','i','c','e',0}; +static const WCHAR smallW[] = {'s','m','a','l','l',0}; +static const WCHAR splitW[] = {'s','p','l','i','t',0}; +static const WCHAR strikeW[] = {'s','t','r','i','k','e',0}; +static const WCHAR subW[] = {'s','u','b',0}; +static const WCHAR substringW[] = {'s','u','b','s','t','r','i','n','g',0}; +static const WCHAR substrW[] = {'s','u','b','s','t','r',0}; +static const WCHAR supW[] = {'s','u','p',0}; +static const WCHAR toLowerCaseW[] = {'t','o','L','o','w','e','r','C','a','s','e',0}; +static const WCHAR toUpperCaseW[] = {'t','o','U','p','p','e','r','C','a','s','e',0}; +static const WCHAR toLocaleLowerCaseW[] = {'t','o','L','o','c','a','l','e','L','o','w','e','r','C','a','s','e',0}; +static const WCHAR toLocaleUpperCaseW[] = {'t','o','L','o','c','a','l','e','U','p','p','e','r','C','a','s','e',0}; +static const WCHAR localeCompareW[] = {'l','o','c','a','l','e','C','o','m','p','a','r','e',0}; +static const WCHAR hasOwnPropertyW[] = {'h','a','s','O','w','n','P','r','o','p','e','r','t','y',0}; +static const WCHAR propertyIsEnumerableW[] = + {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; +static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; + +static void String_destructor(DispatchEx *dispex) +{ + FIXME("\n"); +} + +static HRESULT String_length(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_blink(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_bold(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_charAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_charCodeAt(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_concat(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_italics(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_match(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_replace(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_search(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_slice(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_small(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_split(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_strike(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_sub(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_substring(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_substr(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_sup(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_toLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_toUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_toLocaleLowerCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_toLocaleUpperCase(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_localeCompare(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_propertyIsEnumerable(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT String_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static const builtin_prop_t String_props[] = { + {anchorW, String_anchor, PROPF_METHOD}, + {bigW, String_big, PROPF_METHOD}, + {blinkW, String_blink, PROPF_METHOD}, + {boldW, String_bold, PROPF_METHOD}, + {charAtW, String_charAt, PROPF_METHOD}, + {charCodeAtW, String_charCodeAt, PROPF_METHOD}, + {concatW, String_concat, PROPF_METHOD}, + {fixedW, String_fixed, PROPF_METHOD}, + {fontcolorW, String_fontcolor, PROPF_METHOD}, + {fontsizeW, String_fontsize, PROPF_METHOD}, + {hasOwnPropertyW, String_hasOwnProperty, PROPF_METHOD}, + {indexOfW, String_indexOf, PROPF_METHOD}, + {isPrototypeOfW, String_isPrototypeOf, PROPF_METHOD}, + {italicsW, String_italics, PROPF_METHOD}, + {lastIndexOfW, String_lastIndexOf, PROPF_METHOD}, + {lengthW, String_length, 0}, + {linkW, String_link, PROPF_METHOD}, + {localeCompareW, String_localeCompare, PROPF_METHOD}, + {matchW, String_match, PROPF_METHOD}, + {propertyIsEnumerableW, String_propertyIsEnumerable, PROPF_METHOD}, + {replaceW, String_replace, PROPF_METHOD}, + {searchW, String_search, PROPF_METHOD}, + {sliceW, String_slice, PROPF_METHOD}, + {smallW, String_small, PROPF_METHOD}, + {splitW, String_split, PROPF_METHOD}, + {strikeW, String_strike, PROPF_METHOD}, + {substringW, String_substring, PROPF_METHOD}, + {substrW, String_substr, PROPF_METHOD}, + {subW, String_sub, PROPF_METHOD}, + {supW, String_sup, PROPF_METHOD}, + {toLocaleLowerCaseW, String_toLocaleLowerCase, PROPF_METHOD}, + {toLocaleUpperCaseW, String_toLocaleUpperCase, PROPF_METHOD}, + {toLowerCaseW, String_toLowerCase, PROPF_METHOD}, + {toStringW, String_toString, PROPF_METHOD}, + {toUpperCaseW, String_toUpperCase, PROPF_METHOD}, + {valueOfW, String_valueOf, PROPF_METHOD} +}; + +static const builtin_info_t String_info = { + JSCLASS_STRING, + {NULL, String_value, 0}, + sizeof(String_props)/sizeof(*String_props), + String_props, + String_destructor, + NULL +}; + +static HRESULT StringConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT string_alloc(script_ctx_t *ctx, BOOL use_constr, StringInstance **ret) +{ + StringInstance *string; + HRESULT hres; + + string = heap_alloc_zero(sizeof(StringInstance)); + if(!string) + return E_OUTOFMEMORY; + + if(use_constr) + hres = init_dispex_from_constr(&string->dispex, ctx, &String_info, ctx->string_constr); + else + hres = init_dispex(&string->dispex, ctx, &String_info, NULL); + if(FAILED(hres)) { + heap_free(string); + return hres; + } + + *ret = string; + return S_OK; +} + +HRESULT create_string_constr(script_ctx_t *ctx, DispatchEx **ret) +{ + StringInstance *string; + HRESULT hres; + + hres = string_alloc(ctx, FALSE, &string); + if(FAILED(hres)) + return hres; + + hres = create_builtin_function(ctx, StringConstr_value, PROPF_CONSTR, &string->dispex, ret); + + jsdisp_release(&string->dispex); + return hres; +} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ef3d4d5c2bd..fc4e16f6a52 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -48,5 +48,6 @@ ok(testFunc1.length === 2, "testFunc1.length is not 2"); ok(Object.prototype !== undefined, "Object.prototype is undefined"); ok(Object.prototype.prototype === undefined, "Object.prototype is not undefined"); +ok(String.prototype !== undefined, "String.prototype is undefined"); reportSuccess();