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

jscript: Use prototype for builtin String properties.

This commit is contained in:
Jacek Caban 2012-07-24 13:17:41 +02:00 committed by Alexandre Julliard
parent 1dfb75d9a3
commit 1104663fe7
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/jscript/string.c
View File

@ -1536,6 +1536,19 @@ static const builtin_info_t String_info = {
NULL NULL
}; };
static const builtin_prop_t StringInst_props[] = {
{lengthW, String_length, 0}
};
static const builtin_info_t StringInst_info = {
JSCLASS_STRING,
{NULL, String_value, 0},
sizeof(StringInst_props)/sizeof(*StringInst_props),
StringInst_props,
String_destructor,
NULL
};
/* ECMA-262 3rd Edition 15.5.3.2 */ /* ECMA-262 3rd Edition 15.5.3.2 */
static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags,
unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei) unsigned argc, VARIANT *argv, VARIANT *retv, jsexcept_t *ei)
@ -1635,7 +1648,7 @@ static HRESULT string_alloc(script_ctx_t *ctx, jsdisp_t *object_prototype, Strin
if(object_prototype) if(object_prototype)
hres = init_dispex(&string->dispex, ctx, &String_info, object_prototype); hres = init_dispex(&string->dispex, ctx, &String_info, object_prototype);
else else
hres = init_dispex_from_constr(&string->dispex, ctx, &String_info, ctx->string_constr); hres = init_dispex_from_constr(&string->dispex, ctx, &StringInst_info, ctx->string_constr);
if(FAILED(hres)) { if(FAILED(hres)) {
heap_free(string); heap_free(string);
return hres; return hres;

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

@ -239,6 +239,13 @@ ok(!RegExp.hasOwnProperty('exec'), "RegExp.hasOwnProperty('exec') is true");
ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true"); ok(!RegExp.hasOwnProperty('source'), "RegExp.hasOwnProperty('source') is true");
ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false"); ok(RegExp.prototype.hasOwnProperty('source'), "RegExp.prototype.hasOwnProperty('source') is false");
obj = new String();
ok(!obj.hasOwnProperty('charAt'), "obj.hasOwnProperty('charAt') is true");
ok(obj.hasOwnProperty('length'), "obj.hasOwnProperty('length') is false");
ok(!String.hasOwnProperty('charAt'), "String.hasOwnProperty('charAt') is true");
ok(String.prototype.hasOwnProperty('charAt'), "String.prototype.hasOwnProperty('charAt') is false");
ok(String.prototype.hasOwnProperty('length'), "String.prototype.hasOwnProperty('length') is false");
tmp = "" + new Object(); tmp = "" + new Object();
ok(tmp === "[object Object]", "'' + new Object() = " + tmp); ok(tmp === "[object Object]", "'' + new Object() = " + tmp);
(tmp = new Array).f = Object.prototype.toString; (tmp = new Array).f = Object.prototype.toString;