[PATCH v6 03/12] jscript: Get rid of the value prop and use to_primitive when getting default value.
Gabriel Ivăncescu
gabrielopcode at gmail.com
Tue Nov 23 07:59:08 CST 2021
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
---
Since we get rid of the value prop itself, this requires adjustments to the
DISPID to index parts, and the buckets (0 is now a valid index, so I used ~0).
Note that the previous code was very confusing in some parts; it implicitly
assumed that DISPID == index into the props (such as in get_flags), so it
was fragile.
dlls/jscript/array.c | 15 +----
dlls/jscript/bool.c | 4 +-
dlls/jscript/date.c | 13 +---
dlls/jscript/dispex.c | 128 ++++++++++++++++++++++----------------
dlls/jscript/enumerator.c | 6 +-
dlls/jscript/error.c | 4 +-
dlls/jscript/function.c | 6 +-
dlls/jscript/global.c | 2 +-
dlls/jscript/jscript.c | 2 +-
dlls/jscript/jscript.h | 3 +-
dlls/jscript/json.c | 2 +-
dlls/jscript/jsregexp.c | 6 +-
dlls/jscript/math.c | 2 +-
dlls/jscript/number.c | 14 +----
dlls/jscript/object.c | 20 +-----
dlls/jscript/set.c | 8 +--
dlls/jscript/string.c | 16 +----
dlls/jscript/tests/run.c | 92 +++++++++++++++++++++++++++
dlls/jscript/vbarray.c | 2 +-
19 files changed, 205 insertions(+), 140 deletions(-)
diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c
index 7941031..5f61f99 100644
--- a/dlls/jscript/array.c
+++ b/dlls/jscript/array.c
@@ -1222,15 +1222,6 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi
return S_OK;
}
-static HRESULT Array_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
-{
- ArrayInstance *array = array_from_jsdisp(jsthis);
-
- TRACE("\n");
-
- return array_join(ctx, &array->dispex, array->length, L",", 1, r);
-}
-
static void Array_destructor(jsdisp_t *dispex)
{
heap_free(dispex);
@@ -1279,7 +1270,7 @@ static const builtin_prop_t Array_props[] = {
static const builtin_info_t Array_info = {
JSCLASS_ARRAY,
- {NULL, NULL,0, Array_get_value},
+ NULL,
ARRAY_SIZE(Array_props),
Array_props,
Array_destructor,
@@ -1292,7 +1283,7 @@ static const builtin_prop_t ArrayInst_props[] = {
static const builtin_info_t ArrayInst_info = {
JSCLASS_ARRAY,
- {NULL, NULL,0, Array_get_value},
+ NULL,
ARRAY_SIZE(ArrayInst_props),
ArrayInst_props,
Array_destructor,
@@ -1397,7 +1388,7 @@ static const builtin_prop_t ArrayConstr_props[] = {
static const builtin_info_t ArrayConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(ArrayConstr_props),
ArrayConstr_props,
NULL,
diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c
index 44a8b72..184d8d0 100644
--- a/dlls/jscript/bool.c
+++ b/dlls/jscript/bool.c
@@ -114,7 +114,7 @@ static const builtin_prop_t Bool_props[] = {
static const builtin_info_t Bool_info = {
JSCLASS_BOOLEAN,
- {NULL, Bool_value, 0},
+ Bool_value,
ARRAY_SIZE(Bool_props),
Bool_props,
NULL,
@@ -123,7 +123,7 @@ static const builtin_info_t Bool_info = {
static const builtin_info_t BoolInst_info = {
JSCLASS_BOOLEAN,
- {NULL, Bool_value, 0},
+ Bool_value,
0, NULL,
NULL,
NULL
diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c
index 96d366c..b130c83 100644
--- a/dlls/jscript/date.c
+++ b/dlls/jscript/date.c
@@ -1846,13 +1846,6 @@ static HRESULT Date_setYear(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi
return S_OK;
}
-static HRESULT Date_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
-{
- TRACE("\n");
-
- return dateobj_to_string(date_from_jsdisp(jsthis), r);
-}
-
static const builtin_prop_t Date_props[] = {
{L"getDate", Date_getDate, PROPF_METHOD},
{L"getDay", Date_getDay, PROPF_METHOD},
@@ -1903,7 +1896,7 @@ static const builtin_prop_t Date_props[] = {
static const builtin_info_t Date_info = {
JSCLASS_DATE,
- {NULL, NULL,0, Date_get_value},
+ NULL,
ARRAY_SIZE(Date_props),
Date_props,
NULL,
@@ -1912,7 +1905,7 @@ static const builtin_info_t Date_info = {
static const builtin_info_t DateInst_info = {
JSCLASS_DATE,
- {NULL, NULL,0, Date_get_value},
+ NULL,
0, NULL,
NULL,
NULL
@@ -2440,7 +2433,7 @@ static const builtin_prop_t DateConstr_props[] = {
static const builtin_info_t DateConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(DateConstr_props),
DateConstr_props,
NULL,
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 87b89f1..7cf90dd 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -62,15 +62,17 @@ struct _dispex_prop_t {
static inline DISPID prop_to_id(jsdisp_t *This, dispex_prop_t *prop)
{
- return prop - This->props;
+ return prop - This->props + 1; /* don't overlap with DISPID_VALUE */
}
static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id)
{
- if(id < 0 || id >= This->prop_cnt || This->props[id].type == PROP_DELETED)
+ DWORD idx = id - 1;
+
+ if(idx >= This->prop_cnt || This->props[idx].type == PROP_DELETED)
return NULL;
- return This->props+id;
+ return This->props + idx;
}
static inline BOOL is_function_prop(dispex_prop_t *prop)
@@ -90,8 +92,12 @@ static inline BOOL is_function_prop(dispex_prop_t *prop)
static DWORD get_flags(jsdisp_t *This, dispex_prop_t *prop)
{
if(prop->type == PROP_PROTREF) {
- dispex_prop_t *parent = get_prop(This->prototype, prop->u.ref);
- if(!parent) {
+ dispex_prop_t *parent = NULL;
+
+ if(prop->u.ref < This->prototype->prop_cnt)
+ parent = &This->prototype->props[prop->u.ref];
+
+ if(!parent || parent->type == PROP_DELETED) {
prop->type = PROP_DELETED;
return 0;
}
@@ -162,11 +168,11 @@ static inline HRESULT resize_props(jsdisp_t *This)
This->props = props;
for(i=0; i<This->buf_size; i++) {
- This->props[i].bucket_head = 0;
- This->props[i].bucket_next = 0;
+ This->props[i].bucket_head = ~0;
+ This->props[i].bucket_next = ~0;
}
- for(i=1; i<This->prop_cnt; i++) {
+ for(i=0; i<This->prop_cnt; i++) {
props = This->props+i;
bucket = get_props_idx(This, props->hash);
@@ -214,14 +220,14 @@ static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref
static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret)
{
const builtin_prop_t *builtin;
- unsigned bucket, pos, prev = 0;
+ unsigned bucket, pos, prev = ~0;
dispex_prop_t *prop;
bucket = get_props_idx(This, hash);
pos = This->props[bucket].bucket_head;
- while(pos != 0) {
+ while(pos != ~0) {
if(!wcscmp(name, This->props[pos].name)) {
- if(prev != 0) {
+ if(prev != ~0) {
This->props[prev].bucket_next = This->props[pos].bucket_next;
This->props[pos].bucket_next = This->props[bucket].bucket_head;
This->props[bucket].bucket_head = pos;
@@ -523,26 +529,22 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
switch(prop->type) {
case PROP_BUILTIN: {
+ vdisp_t vthis;
+
if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) {
WARN("%s is not a constructor\n", debugstr_w(prop->name));
return E_INVALIDARG;
}
- if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) {
- vdisp_t vthis;
+ if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval)
+ flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
+ if(jsthis)
+ set_disp(&vthis, jsthis);
+ else
+ set_jsdisp(&vthis, This);
+ hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r);
+ vdisp_release(&vthis);
- if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval)
- flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
- if(jsthis)
- set_disp(&vthis, jsthis);
- else
- set_jsdisp(&vthis, This);
- hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r);
- vdisp_release(&vthis);
- }else {
- /* Function object calls are special case */
- hres = Function_invoke(This, jsthis, flags, argc, argv, r);
- }
return hres;
}
case PROP_PROTREF:
@@ -605,8 +607,6 @@ static HRESULT fill_protrefs(jsdisp_t *This)
fill_protrefs(This->prototype);
for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) {
- if(!iter->name)
- continue;
hres = find_prop_name(This, iter->hash, iter->name, &prop);
if(FAILED(hres))
return hres;
@@ -1398,12 +1398,12 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC
for (prop = This->props, end = prop + This->prop_cnt; prop != end; prop++)
{
- if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE))
+ if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE))
continue;
/* If two identifiers differ only by case, the TypeInfo fails */
pos = This->props[get_props_idx(This, prop->hash)].bucket_head;
- while (pos)
+ while (pos != ~0)
{
cur = This->props + pos;
@@ -1453,7 +1453,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC
typevar = typeinfo->vars;
for (prop = This->props; prop != end; prop++)
{
- if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE))
+ if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE))
continue;
if (is_function_prop(prop))
@@ -1548,7 +1548,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
V_VT(pvarRes) = VT_EMPTY;
prop = get_prop(This, id);
- if(!prop || prop->type == PROP_DELETED) {
+ if(!prop && id != DISPID_VALUE) {
TRACE("invalid id\n");
return DISP_E_MEMBERNOTFOUND;
}
@@ -1568,7 +1568,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
if(FAILED(hres))
break;
- hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller);
+ if(prop)
+ hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller);
+ else
+ hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL);
+
if(argv != buf)
heap_free(argv);
if(SUCCEEDED(hres) && pvarRes) {
@@ -1580,7 +1584,14 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
case DISPATCH_PROPERTYGET: {
jsval_t r;
- hres = prop_get(This, prop, &r);
+ if(prop)
+ hres = prop_get(This, prop, &r);
+ else {
+ hres = to_primitive(This->ctx, jsval_obj(This), &r, NO_HINT);
+ if(hres == JS_E_TO_PRIMITIVE)
+ hres = DISP_E_MEMBERNOTFOUND;
+ }
+
if(SUCCEEDED(hres)) {
hres = jsval_to_variant(r, pvarRes);
jsval_release(r);
@@ -1591,6 +1602,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
jsval_t val;
DWORD i;
+ if(!prop) {
+ hres = DISP_E_MEMBERNOTFOUND;
+ break;
+ }
+
for(i=0; i < pdp->cNamedArgs; i++) {
if(pdp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT)
break;
@@ -1701,7 +1717,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS
TRACE("(%p)->(%x %p)\n", This, id, pbstrName);
prop = get_prop(This, id);
- if(!prop || !prop->name || prop->type == PROP_DELETED)
+ if(!prop)
return DISP_E_MEMBERNOTFOUND;
*pbstrName = SysAllocString(prop->name);
@@ -1714,11 +1730,12 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS
static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid)
{
jsdisp_t *This = impl_from_IDispatchEx(iface);
- HRESULT hres;
+ HRESULT hres = S_FALSE;
TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid);
- hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid);
+ if(id != DISPID_VALUE)
+ hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid);
if(hres == S_FALSE)
*pid = DISPID_STARTENUM;
return hres;
@@ -1762,29 +1779,29 @@ jsdisp_t *to_jsdisp(IDispatch *disp)
HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *prototype)
{
+ unsigned i;
+
TRACE("%p (%p)\n", dispex, prototype);
dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl;
dispex->ref = 1;
dispex->builtin_info = builtin_info;
dispex->extensible = TRUE;
+ dispex->prop_cnt = 0;
dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4));
if(!dispex->props)
return E_OUTOFMEMORY;
+ for(i = 0; i < dispex->buf_size; i++) {
+ dispex->props[i].bucket_head = ~0;
+ dispex->props[i].bucket_next = ~0;
+ }
+
dispex->prototype = prototype;
if(prototype)
jsdisp_addref(prototype);
- dispex->prop_cnt = 1;
- if(builtin_info->value_prop.invoke || builtin_info->value_prop.getter) {
- dispex->props[0].type = PROP_BUILTIN;
- dispex->props[0].u.p = &builtin_info->value_prop;
- }else {
- dispex->props[0].type = PROP_DELETED;
- }
-
script_addref(ctx);
dispex->ctx = ctx;
@@ -1793,7 +1810,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b
static const builtin_info_t dispex_info = {
JSCLASS_NONE,
- {NULL, NULL, 0},
+ NULL,
0, NULL,
NULL,
NULL
@@ -1944,14 +1961,14 @@ HRESULT jsdisp_call_value(jsdisp_t *jsfunc, IDispatch *jsthis, WORD flags, unsig
}else {
vdisp_t vdisp;
- if(!jsfunc->builtin_info->value_prop.invoke) {
+ if(!jsfunc->builtin_info->call) {
WARN("Not a function\n");
return JS_E_FUNCTION_EXPECTED;
}
set_disp(&vdisp, jsthis);
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
- hres = jsfunc->builtin_info->value_prop.invoke(jsfunc->ctx, &vdisp, flags, argc, argv, r);
+ hres = jsfunc->builtin_info->call(jsfunc->ctx, &vdisp, flags, argc, argv, r);
vdisp_release(&vdisp);
}
return hres;
@@ -2044,7 +2061,10 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns
if(ctx != jsdisp->ctx)
flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK;
- hres = jsdisp_call(jsdisp, id, flags, argc, argv, ret);
+ if(id == DISPID_VALUE)
+ hres = jsdisp_call_value(jsdisp, to_disp(jsdisp), flags, argc, argv, ret);
+ else
+ hres = jsdisp_call(jsdisp, id, flags, argc, argv, ret);
jsdisp_release(jsdisp);
return hres;
}
@@ -2402,6 +2422,7 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret)
HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_type, DISPID *ret)
{
dispex_prop_t *iter;
+ DWORD idx = id - 1;
HRESULT hres;
if(id == DISPID_STARTENUM && enum_type == JSDISP_ENUM_ALL) {
@@ -2410,11 +2431,14 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty
return hres;
}
- if(id + 1 < 0 || id+1 >= obj->prop_cnt)
+ if(id == DISPID_STARTENUM)
+ idx = -1;
+
+ if(idx + 1 >= obj->prop_cnt)
return S_FALSE;
- for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) {
- if(!iter->name || iter->type == PROP_DELETED)
+ for(iter = &obj->props[idx + 1]; iter < obj->props + obj->prop_cnt; iter++) {
+ if(iter->type == PROP_DELETED)
continue;
if(enum_type != JSDISP_ENUM_ALL && iter->type == PROP_PROTREF)
continue;
@@ -2721,7 +2745,7 @@ HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r)
{
dispex_prop_t *prop = get_prop(obj, id);
- if(!prop || !prop->name || prop->type == PROP_DELETED)
+ if(!prop)
return DISP_E_MEMBERNOTFOUND;
*r = jsstr_alloc(prop->name);
diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c
index dea1940..038b474 100644
--- a/dlls/jscript/enumerator.c
+++ b/dlls/jscript/enumerator.c
@@ -180,7 +180,7 @@ static const builtin_prop_t Enumerator_props[] = {
static const builtin_info_t Enumerator_info = {
JSCLASS_ENUMERATOR,
- {NULL, NULL, 0},
+ NULL,
ARRAY_SIZE(Enumerator_props),
Enumerator_props,
NULL,
@@ -189,7 +189,7 @@ static const builtin_info_t Enumerator_info = {
static const builtin_info_t EnumeratorInst_info = {
JSCLASS_ENUMERATOR,
- {NULL, NULL, 0, NULL},
+ NULL,
0,
NULL,
Enumerator_destructor,
@@ -317,7 +317,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl
static const builtin_info_t EnumeratorConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
0,
NULL,
NULL,
diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c
index bb9e5a2..49adaeb 100644
--- a/dlls/jscript/error.c
+++ b/dlls/jscript/error.c
@@ -136,7 +136,7 @@ static const builtin_prop_t Error_props[] = {
static const builtin_info_t Error_info = {
JSCLASS_ERROR,
- {NULL, Error_value, 0},
+ Error_value,
ARRAY_SIZE(Error_props),
Error_props,
NULL,
@@ -145,7 +145,7 @@ static const builtin_info_t Error_info = {
static const builtin_info_t ErrorInst_info = {
JSCLASS_ERROR,
- {NULL, Error_value, 0},
+ Error_value,
0,
NULL,
NULL,
diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c
index 318d6be..3eef1aa 100644
--- a/dlls/jscript/function.c
+++ b/dlls/jscript/function.c
@@ -172,7 +172,7 @@ static HRESULT Arguments_idx_put(jsdisp_t *jsdisp, unsigned idx, jsval_t val)
static const builtin_info_t Arguments_info = {
JSCLASS_ARGUMENTS,
- {NULL, Arguments_value, 0},
+ Arguments_value,
0, NULL,
Arguments_destructor,
NULL,
@@ -545,7 +545,7 @@ static const builtin_prop_t Function_props[] = {
static const builtin_info_t Function_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(Function_props),
Function_props,
Function_destructor,
@@ -559,7 +559,7 @@ static const builtin_prop_t FunctionInst_props[] = {
static const builtin_info_t FunctionInst_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(FunctionInst_props),
FunctionInst_props,
Function_destructor,
diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c
index 2665bec..c9a00d1 100644
--- a/dlls/jscript/global.c
+++ b/dlls/jscript/global.c
@@ -904,7 +904,7 @@ static const builtin_prop_t JSGlobal_props[] = {
static const builtin_info_t JSGlobal_info = {
JSCLASS_GLOBAL,
- {NULL, NULL, 0},
+ NULL,
ARRAY_SIZE(JSGlobal_props),
JSGlobal_props,
NULL,
diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c
index 9148451..160269c 100644
--- a/dlls/jscript/jscript.c
+++ b/dlls/jscript/jscript.c
@@ -112,7 +112,7 @@ HRESULT create_named_item_script_obj(script_ctx_t *ctx, named_item_t *item)
{
static const builtin_info_t disp_info = {
JSCLASS_GLOBAL,
- {NULL, NULL, 0},
+ NULL,
0, NULL,
NULL,
NULL
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 69897cd..c192ec7 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -232,7 +232,7 @@ typedef struct {
typedef struct {
jsclass_t class;
- builtin_prop_t value_prop;
+ builtin_invoke_t call;
DWORD props_cnt;
const builtin_prop_t *props;
void (*destructor)(jsdisp_t*);
@@ -340,7 +340,6 @@ HRESULT Function_invoke(jsdisp_t*,IDispatch*,WORD,unsigned,jsval_t*,jsval_t*) DE
HRESULT Function_value(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*) DECLSPEC_HIDDEN;
HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN;
struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN;
-#define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value}
HRESULT throw_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
jsdisp_t *create_builtin_error(script_ctx_t *ctx) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c
index f2fbb80..d3896ca 100644
--- a/dlls/jscript/json.c
+++ b/dlls/jscript/json.c
@@ -839,7 +839,7 @@ static const builtin_prop_t JSON_props[] = {
static const builtin_info_t JSON_info = {
JSCLASS_JSON,
- {NULL, NULL, 0},
+ NULL,
ARRAY_SIZE(JSON_props),
JSON_props,
NULL,
diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c
index f80452d..cb6c051 100644
--- a/dlls/jscript/jsregexp.c
+++ b/dlls/jscript/jsregexp.c
@@ -563,7 +563,7 @@ static const builtin_prop_t RegExp_props[] = {
static const builtin_info_t RegExp_info = {
JSCLASS_REGEXP,
- {NULL, RegExp_value, 0},
+ RegExp_value,
ARRAY_SIZE(RegExp_props),
RegExp_props,
RegExp_destructor,
@@ -580,7 +580,7 @@ static const builtin_prop_t RegExpInst_props[] = {
static const builtin_info_t RegExpInst_info = {
JSCLASS_REGEXP,
- {NULL, RegExp_value, 0},
+ RegExp_value,
ARRAY_SIZE(RegExpInst_props),
RegExpInst_props,
RegExp_destructor,
@@ -952,7 +952,7 @@ static const builtin_prop_t RegExpConstr_props[] = {
static const builtin_info_t RegExpConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(RegExpConstr_props),
RegExpConstr_props,
NULL,
diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c
index 475b9b2..c65bbaf 100644
--- a/dlls/jscript/math.c
+++ b/dlls/jscript/math.c
@@ -492,7 +492,7 @@ static const builtin_prop_t Math_props[] = {
static const builtin_info_t Math_info = {
JSCLASS_MATH,
- {NULL, NULL, 0},
+ NULL,
ARRAY_SIZE(Math_props),
Math_props,
NULL,
diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c
index 3c96532..410f27b 100644
--- a/dlls/jscript/number.c
+++ b/dlls/jscript/number.c
@@ -494,16 +494,6 @@ static HRESULT Number_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un
return S_OK;
}
-static HRESULT Number_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
-{
- NumberInstance *number = number_from_jsdisp(jsthis);
-
- TRACE("(%p)\n", number);
-
- *r = jsval_number(number->value);
- return S_OK;
-}
-
static const builtin_prop_t Number_props[] = {
{L"toExponential", Number_toExponential, PROPF_METHOD|1},
{L"toFixed", Number_toFixed, PROPF_METHOD},
@@ -515,7 +505,7 @@ static const builtin_prop_t Number_props[] = {
static const builtin_info_t Number_info = {
JSCLASS_NUMBER,
- {NULL, NULL,0, Number_get_value},
+ NULL,
ARRAY_SIZE(Number_props),
Number_props,
NULL,
@@ -524,7 +514,7 @@ static const builtin_info_t Number_info = {
static const builtin_info_t NumberInst_info = {
JSCLASS_NUMBER,
- {NULL, NULL,0, Number_get_value},
+ NULL,
0, NULL,
NULL,
NULL
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 89684f5..24692f8 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -243,20 +243,6 @@ static HRESULT Object_set_proto_(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t va
return jsdisp_change_prototype(jsthis, proto);
}
-static HRESULT Object_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
-{
- jsstr_t *ret;
-
- TRACE("\n");
-
- ret = jsstr_alloc(L"[object Object]");
- if(!ret)
- return E_OUTOFMEMORY;
-
- *r = jsval_string(ret);
- return S_OK;
-}
-
static void Object_destructor(jsdisp_t *dispex)
{
heap_free(dispex);
@@ -274,7 +260,7 @@ static const builtin_prop_t Object_props[] = {
static const builtin_info_t Object_info = {
JSCLASS_OBJECT,
- {NULL, NULL,0, Object_get_value},
+ NULL,
ARRAY_SIZE(Object_props),
Object_props,
Object_destructor,
@@ -283,7 +269,7 @@ static const builtin_info_t Object_info = {
static const builtin_info_t ObjectInst_info = {
JSCLASS_OBJECT,
- {NULL, NULL,0, Object_get_value},
+ NULL,
0, NULL,
Object_destructor,
NULL
@@ -889,7 +875,7 @@ static const builtin_prop_t ObjectConstr_props[] = {
static const builtin_info_t ObjectConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(ObjectConstr_props),
ObjectConstr_props,
NULL,
diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c
index 8f355f4..5ae41d8 100644
--- a/dlls/jscript/set.c
+++ b/dlls/jscript/set.c
@@ -89,7 +89,7 @@ static const builtin_prop_t Set_props[] = {
static const builtin_info_t Set_prototype_info = {
JSCLASS_SET,
- {NULL, Set_value, 0},
+ Set_value,
ARRAY_SIZE(Set_props),
Set_props,
NULL,
@@ -98,7 +98,7 @@ static const builtin_info_t Set_prototype_info = {
static const builtin_info_t Set_info = {
JSCLASS_SET,
- {NULL, Set_value, 0},
+ Set_value,
0, NULL,
NULL,
NULL
@@ -414,7 +414,7 @@ static const builtin_prop_t Map_props[] = {
static const builtin_info_t Map_prototype_info = {
JSCLASS_OBJECT,
- {NULL, Map_value, 0},
+ Map_value,
ARRAY_SIZE(Map_prototype_props),
Map_prototype_props,
NULL,
@@ -423,7 +423,7 @@ static const builtin_info_t Map_prototype_info = {
static const builtin_info_t Map_info = {
JSCLASS_MAP,
- {NULL, Map_value, 0},
+ Map_value,
ARRAY_SIZE(Map_props),
Map_props,
Map_destructor,
diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c
index 4f6d8cd..5958216 100644
--- a/dlls/jscript/string.c
+++ b/dlls/jscript/string.c
@@ -1493,16 +1493,6 @@ static HRESULT String_localeCompare(script_ctx_t *ctx, vdisp_t *jsthis, WORD fla
return E_NOTIMPL;
}
-static HRESULT String_get_value(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r)
-{
- StringInstance *This = string_from_jsdisp(jsthis);
-
- TRACE("\n");
-
- *r = jsval_string(jsstr_addref(This->str));
- return S_OK;
-}
-
static void String_destructor(jsdisp_t *dispex)
{
StringInstance *This = string_from_jsdisp(dispex);
@@ -1579,7 +1569,7 @@ static const builtin_prop_t String_props[] = {
static const builtin_info_t String_info = {
JSCLASS_STRING,
- {NULL, NULL,0, String_get_value},
+ NULL,
ARRAY_SIZE(String_props),
String_props,
String_destructor,
@@ -1592,7 +1582,7 @@ static const builtin_prop_t StringInst_props[] = {
static const builtin_info_t StringInst_info = {
JSCLASS_STRING,
- {NULL, NULL,0, String_get_value},
+ NULL,
ARRAY_SIZE(StringInst_props),
StringInst_props,
String_destructor,
@@ -1710,7 +1700,7 @@ static const builtin_prop_t StringConstr_props[] = {
static const builtin_info_t StringConstr_info = {
JSCLASS_FUNCTION,
- DEFAULT_FUNCTION_VALUE,
+ Function_value,
ARRAY_SIZE(StringConstr_props),
StringConstr_props,
NULL,
diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c
index ef0f39f..0e2f633 100644
--- a/dlls/jscript/tests/run.c
+++ b/dlls/jscript/tests/run.c
@@ -2789,6 +2789,8 @@ static void test_retval(void)
static void test_default_value(void)
{
+ static DISPID propput_dispid = DISPID_PROPERTYPUT;
+ IActiveScript *script;
DISPPARAMS dp = {0};
IDispatch *disp;
VARIANT v;
@@ -2806,9 +2808,99 @@ static void test_default_value(void)
{
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
}
+ VariantClear(&v);
+ IDispatch_Release(disp);
+
+ hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr.valueOf = function() {return 42;}; arr", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+ ok(hres == S_OK, "Invoke failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));
+ ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+ ok(hres == S_OK, "Invoke failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ ok(!lstrcmpW(V_BSTR(&v), L"foo"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"var arr = [5]; arr", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+ ok(hres == S_OK, "Invoke failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ ok(!lstrcmpW(V_BSTR(&v), L"5"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+ IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"var obj = Object.prototype; delete obj.valueOf; obj", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+ ok(hres == S_OK, "Invoke failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ ok(!lstrcmpW(V_BSTR(&v), L"[object Object]"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+ IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"var obj = Object.prototype; delete obj.toString; obj", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL);
+ ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres);
+ IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"Object.prototype", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ dp.cArgs = dp.cNamedArgs = 1;
+ dp.rgdispidNamedArgs = &propput_dispid;
+ dp.rgvarg = &v;
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
+ ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres);
+ IDispatch_Release(disp);
+ close_script(script);
+
+ hres = parse_script_expr(L"var f = function() {return 42;}; f", &v, &script);
+ ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v));
+ disp = V_DISPATCH(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL);
+ ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres);
+ IDispatch_Release(disp);
+ close_script(script);
}
static void test_script_exprs(void)
diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c
index 69a77f1..41faa20 100644
--- a/dlls/jscript/vbarray.c
+++ b/dlls/jscript/vbarray.c
@@ -251,7 +251,7 @@ static const builtin_prop_t VBArray_props[] = {
static const builtin_info_t VBArray_info = {
JSCLASS_VBARRAY,
- {NULL, VBArray_value, 0},
+ VBArray_value,
ARRAY_SIZE(VBArray_props),
VBArray_props,
VBArray_destructor,
--
2.31.1
More information about the wine-devel
mailing list