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

jscript: Make idx props enumerable. 

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gabriel Ivăncescu 2022-04-11 18:58:51 +03:00 committed by Alexandre Julliard
parent 67fef476c7
commit 45d8af4cf3
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/jscript/dispex.c
View File

@ -285,7 +285,10 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name,
for(ptr = name; is_digit(*ptr) && idx < 0x10000; ptr++)
idx = idx*10 + (*ptr-'0');
if(!*ptr && idx < This->builtin_info->idx_length(This)) {
prop = alloc_prop(This, name, PROP_IDX, This->builtin_info->idx_put ? PROPF_WRITABLE : 0);
unsigned flags = PROPF_ENUMERABLE;
if(This->builtin_info->idx_put)
flags |= PROPF_WRITABLE;
prop = alloc_prop(This, name, PROP_IDX, flags);
if(!prop)
return E_OUTOFMEMORY;
@ -2444,6 +2447,18 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty
HRESULT hres;
if(id == DISPID_STARTENUM) {
if(obj->builtin_info->idx_length) {
unsigned i = 0, len = obj->builtin_info->idx_length(obj);
WCHAR name[12];
for(i = 0; i < len; i++) {
swprintf(name, ARRAY_SIZE(name), L"%d", i);
hres = find_prop_name(obj, string_hash(name), name, &iter);
if(FAILED(hres))
return hres;
}
}
if (enum_type == JSDISP_ENUM_ALL) {
hres = fill_protrefs(obj);
if(FAILED(hres))

28
dlls/mshtml/tests/es5.js
View File

@ -654,12 +654,38 @@ sync_test("property_definitions", function() {
});
sync_test("string_idx", function() {
var s = "foobar";
var i, s = "foobar";
ok(s[0] === "f", "s[0] = " + s[0]);
ok(s[5] === "r", "s[5] = " + s[5]);
ok(s[6] === undefined, "s[6] = " + s[6]);
ok((delete s[0]) === false, "delete s[0] returned true");
ok((delete s[6]) === true, "delete s[6] returned false");
s[6] = "X";
ok(s[6] === undefined, "s[6] = " + s[6]);
s = new String(s);
test_own_data_prop_desc(s, "0", false, true, false);
test_own_data_prop_desc(s, "1", false, true, false);
ok(!s.hasOwnProperty("6"), "'6' is a property");
s[7] = "X";
ok(s[7] === "X", "s[7] = " + s[7]);
// s.hasOwnProperty("7") returns false on Win8 likely due to a bug in its js engine
Object.defineProperty(s, "8", {writable: false, enumerable: true, configurable: true, value: "Y"});
ok(s[8] === "Y", "s[8] = " + s[8]);
ok(s.hasOwnProperty("8"), "'8' not a property");
String.prototype[9] = "Z";
ok(s[9] === "Z", "s[9] = " + s[9]);
delete String.prototype[9];
i = 0;
for(var idx in s) {
ok(s[idx] === "foobar XY"[idx], "enum s[" + idx + "] = " + s[idx]);
i++;
}
ok(i === 8, "enum did " + i + " iterations");
});
sync_test("string_trim", function() {