From: Jacek Caban jacek@codeweavers.com
--- dlls/jscript/dispex.c | 26 +++++++++++++------------- dlls/jscript/engine.c | 8 ++++---- dlls/jscript/function.c | 8 ++++---- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/string.c | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 72af7054570..ed1cf397927 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -36,7 +36,7 @@ typedef enum { PROP_PROTREF, PROP_ACCESSOR, PROP_DELETED, - PROP_IDX + PROP_EXTERN } prop_type_t;
struct _dispex_prop_t { @@ -49,7 +49,7 @@ struct _dispex_prop_t { jsval_t val; const builtin_prop_t *p; DWORD ref; - unsigned idx; + unsigned id; struct { jsdisp_t *getter; jsdisp_t *setter; @@ -256,13 +256,13 @@ static HRESULT find_external_prop(jsdisp_t *This, const WCHAR *name, BOOL case_i idx = idx*10 + (*ptr-'0'); if(!*ptr && idx < This->builtin_info->idx_length(This)) { unsigned flags = PROPF_ENUMERABLE; - if(This->builtin_info->idx_put) + if(This->builtin_info->prop_put) flags |= PROPF_WRITABLE; - prop = alloc_prop(This, name, PROP_IDX, flags); + prop = alloc_prop(This, name, PROP_EXTERN, flags); if(!prop) return E_OUTOFMEMORY;
- prop->u.idx = idx; + prop->u.id = idx; *ret = prop; return S_OK; } @@ -475,8 +475,8 @@ static HRESULT prop_get(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t *prop, hres = S_OK; } break; - case PROP_IDX: - hres = prop_obj->builtin_info->idx_get(prop_obj, prop->u.idx, r); + case PROP_EXTERN: + hres = prop_obj->builtin_info->prop_get(prop_obj, prop->u.id, r); break; default: ERR("type %d\n", prop->type); @@ -536,12 +536,12 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val) return S_OK; } return jsdisp_call_value(prop->u.accessor.setter, jsval_obj(This), DISPATCH_METHOD, 1, &val, NULL); - case PROP_IDX: - if(!This->builtin_info->idx_put) { - TRACE("no put_idx\n"); + case PROP_EXTERN: + if(!This->builtin_info->prop_put) { + TRACE("no prop_put\n"); return S_OK; } - return This->builtin_info->idx_put(This, prop->u.idx, val); + return This->builtin_info->prop_put(This, prop->u.id, val); default: ERR("type %d\n", prop->type); return E_FAIL; @@ -583,7 +583,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t flags, argc, argv, r, caller); } case PROP_ACCESSOR: - case PROP_IDX: { + case PROP_EXTERN: { jsval_t val;
hres = prop_get(This, jsthis ? jsthis : (IDispatch *)&This->IDispatchEx_iface, prop, &val); @@ -2976,7 +2976,7 @@ HRESULT jsdisp_get_own_property(jsdisp_t *obj, const WCHAR *name, BOOL flags_onl switch(prop->type) { case PROP_BUILTIN: case PROP_JSVAL: - case PROP_IDX: + case PROP_EXTERN: desc->mask |= PROPF_WRITABLE; desc->explicit_value = TRUE; if(!flags_only) { diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 60b479fb83b..2e52bb5ed2f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -485,14 +485,14 @@ static unsigned scope_idx_length(jsdisp_t *dispex) return scope->detached_vars->argc; }
-static HRESULT scope_idx_get(jsdisp_t *dispex, unsigned idx, jsval_t *r) +static HRESULT scope_prop_get(jsdisp_t *dispex, unsigned idx, jsval_t *r) { scope_chain_t *scope = scope_from_dispex(dispex);
return jsval_copy(scope->detached_vars->var[idx], r); }
-static HRESULT scope_idx_put(jsdisp_t *dispex, unsigned idx, jsval_t val) +static HRESULT scope_prop_put(jsdisp_t *dispex, unsigned idx, jsval_t val) { scope_chain_t *scope = scope_from_dispex(dispex); jsval_t copy, *ref; @@ -547,8 +547,8 @@ static const builtin_info_t scope_info = { JSCLASS_NONE, .destructor = scope_destructor, .idx_length = scope_idx_length, - .idx_get = scope_idx_get, - .idx_put = scope_idx_put, + .prop_get = scope_prop_get, + .prop_put = scope_prop_put, .gc_traverse = scope_gc_traverse };
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 9c339b807f7..7f0779c2aff 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -132,7 +132,7 @@ static jsval_t *get_argument_ref(ArgumentsInstance *arguments, unsigned idx) return arguments->scope->detached_vars->var + idx; }
-static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +static HRESULT Arguments_prop_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp);
@@ -141,7 +141,7 @@ static HRESULT Arguments_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) return jsval_copy(*get_argument_ref(arguments, idx), r); }
-static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) +static HRESULT Arguments_prop_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val) { ArgumentsInstance *arguments = arguments_from_jsdisp(jsdisp); jsval_t copy, *ref; @@ -187,8 +187,8 @@ static const builtin_info_t Arguments_info = { .call = Arguments_value, .destructor = Arguments_destructor, .idx_length = Arguments_idx_length, - .idx_get = Arguments_idx_get, - .idx_put = Arguments_idx_put, + .prop_get = Arguments_prop_get, + .prop_put = Arguments_prop_put, .gc_traverse = Arguments_gc_traverse };
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 80641731006..7ee6949bdea 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -186,8 +186,8 @@ typedef struct { void (*destructor)(jsdisp_t*); void (*on_put)(jsdisp_t*,const WCHAR*); unsigned (*idx_length)(jsdisp_t*); - HRESULT (*idx_get)(jsdisp_t*,unsigned,jsval_t*); - HRESULT (*idx_put)(jsdisp_t*,unsigned,jsval_t); + HRESULT (*prop_get)(jsdisp_t*,unsigned,jsval_t*); + HRESULT (*prop_put)(jsdisp_t*,unsigned,jsval_t); HRESULT (*gc_traverse)(struct gc_ctx*,enum gc_traverse_op,jsdisp_t*); } builtin_info_t;
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index ab7497912f2..9e1b7aff11c 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1515,7 +1515,7 @@ static unsigned String_idx_length(jsdisp_t *jsdisp) return string->dispex.ctx->version < 2 ? 0 : jsstr_length(string->str); }
-static HRESULT String_idx_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) +static HRESULT String_prop_get(jsdisp_t *jsdisp, unsigned idx, jsval_t *r) { StringInstance *string = string_from_jsdisp(jsdisp); jsstr_t *ret; @@ -1584,7 +1584,7 @@ static const builtin_info_t StringInst_info = { .props = StringInst_props, .destructor = String_destructor, .idx_length = String_idx_length, - .idx_get = String_idx_get, + .prop_get = String_prop_get, };
/* ECMA-262 3rd Edition 15.5.3.2 */