[PATCH v6 1/2] jscript: implement Enumerator()
Andreas Maier
staubim at quantentunnel.de
Wed May 15 16:30:08 CDT 2019
Signed-off-by: Andreas Maier <staubim at quantentunnel.de>
---
dlls/jscript/enumerator.c | 212 ++++++++++++++++++++++++++++++++++++++++++----
dlls/jscript/jscript.h | 2 +
dlls/jscript/object.c | 2 +-
dlls/jscript/resource.h | 1 +
4 files changed, 198 insertions(+), 19 deletions(-)
diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c
index d0502f6afa..e72da78cbb 100644
--- a/dlls/jscript/enumerator.c
+++ b/dlls/jscript/enumerator.c
@@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript);
typedef struct {
jsdisp_t dispex;
+ /* IEnumVARIANT returned by _NewEnum */
+ IEnumVARIANT *enumvar;
+ /* current item */
+ jsval_t item;
+ BOOL atend;
} EnumeratorInstance;
static const WCHAR atEndW[] = {'a','t','E','n','d',0};
@@ -33,43 +38,139 @@ static const WCHAR itemW[] = {'i','t','e','m',0};
static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0};
static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0};
+static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp)
+{
+ return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex);
+}
+
+static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp)
+{
+ return enumerator_from_jsdisp(vdisp->u.jsdisp);
+}
+
+static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis)
+{
+ return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL;
+}
+
+static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This)
+{
+ HRESULT hres;
+ VARIANT nextitem;
+
+ if (This->atend)
+ {
+ This->item = jsval_undefined();
+ return S_OK;
+ }
+
+ /* dont leak pervious value */
+ jsval_release(This->item);
+
+ /* not at end ... get next item */
+ VariantInit(&nextitem);
+ hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL);
+ if (hres == S_OK)
+ {
+ hres = variant_to_jsval(&nextitem, &This->item);
+ if (FAILED(hres))
+ {
+ ERR("failed to convert jsval to variant!");
+ This->item = jsval_undefined();
+ }
+ }
+ else
+ {
+ This->item = jsval_undefined();
+ This->atend = TRUE;
+ }
+ VariantClear(&nextitem);
+
+ return S_OK;
+}
+
static void Enumerator_destructor(jsdisp_t *dispex)
{
- TRACE("Enumerator_destructor\n");
+ EnumeratorInstance *This = enumerator_from_jsdisp(dispex);
+ TRACE("\n");
+
+ jsval_release(This->item);
heap_free(dispex);
}
static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- TRACE("Enumerator_atEnd\n");
+ EnumeratorInstance *This;
+
+ if (!(This = enumerator_this(jsthis)))
+ return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL);
+
+ if (r)
+ *r = jsval_bool(This->atend);
- return E_NOTIMPL;
+ TRACE("%d\n", This->atend);
+
+ return S_OK;
}
static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- TRACE("Enumerator_item\n");
+ EnumeratorInstance *This;
+
+ TRACE("\n");
- return E_NOTIMPL;
+ if (!(This = enumerator_this(jsthis)))
+ return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL);
+
+ return r ? jsval_copy(This->item, r) : S_OK;
}
static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- TRACE("Enumerator_moveFirst\n");
+ EnumeratorInstance *This;
+ HRESULT hres = S_OK;
+
+ TRACE("\n");
- return E_NOTIMPL;
+ if (!(This = enumerator_this(jsthis)))
+ return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL);
+
+ if (This->enumvar)
+ {
+ This->atend = FALSE;
+ hres = IEnumVARIANT_Reset(This->enumvar);
+ if (!FAILED(hres))
+ hres = enumvar_get_next_item(This);
+ }
+
+ if (r)
+ *r = jsval_undefined();
+
+ return hres;
}
static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,
jsval_t *r)
{
- TRACE("Enumerator_moveNext\n");
+ EnumeratorInstance *This;
+ HRESULT hres = S_OK;
- return E_NOTIMPL;
+ TRACE("\n");
+
+ if (!(This = enumerator_this(jsthis)))
+ return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL);
+
+ if (This->enumvar)
+ hres = enumvar_get_next_item(This);
+
+ if (r)
+ *r = jsval_undefined();
+
+ return hres;
}
static const builtin_prop_t Enumerator_props[] = {
@@ -80,7 +181,7 @@ static const builtin_prop_t Enumerator_props[] = {
};
static const builtin_info_t Enumerator_info = {
- JSCLASS_OBJECT,
+ JSCLASS_ENUMERATOR,
{NULL, NULL, 0},
ARRAY_SIZE(Enumerator_props),
Enumerator_props,
@@ -89,7 +190,7 @@ static const builtin_info_t Enumerator_info = {
};
static const builtin_info_t EnumeratorInst_info = {
- JSCLASS_OBJECT,
+ JSCLASS_ENUMERATOR,
{NULL, NULL, 0, NULL},
0,
NULL,
@@ -101,16 +202,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl
jsval_t *r)
{
jsdisp_t *obj;
+ jsval_t *arg0;
HRESULT hres;
- TRACE("EnumeratorConstr_value\n");
+ TRACE("\n");
switch(flags) {
case DISPATCH_CONSTRUCT: {
- if (argc != 1)
- return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL);
+ if (argc > 1)
+ return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL);
- hres = create_enumerator(ctx, &argv[0], &obj);
+ arg0 = (argc == 1) ? &argv[0] : 0;
+ hres = create_enumerator(ctx, arg0, &obj);
if(FAILED(hres))
return hres;
@@ -118,7 +221,7 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl
break;
}
default:
- FIXME("unimplemented flags: %x\n", flags);
+ ERR("unimplemented flags: %x\n", flags);
return E_NOTIMPL;
}
@@ -140,7 +243,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E
hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info,
ctx->enumerator_constr);
- if(FAILED(hres)) {
+ if(FAILED(hres))
+ {
heap_free(enumerator);
return hres;
}
@@ -180,11 +284,83 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret)
{
EnumeratorInstance *enumerator;
HRESULT hres;
+ IDispatch *obj;
+ DISPPARAMS dispparams = {NULL, NULL, 0, 0};
+ VARIANT varresult;
+ BOOL atend;
+
+ IEnumVARIANT *enumvar;
+
+ memset(&varresult, 0, sizeof(VARIANT));
+ VariantInit(&varresult);
+
+ /* new Enumerator() */
+ if (argv == NULL)
+ {
+ enumvar = NULL;
+ atend = TRUE;
+ }
+ else if (is_object_instance(*argv))
+ {
+ obj = get_object(*argv);
+
+ /* Try to get a IEnumVARIANT by _NewEnum */
+ hres = IDispatch_Invoke(obj,
+ DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL,
+ DISPATCH_METHOD, &dispparams, &varresult,
+ NULL, NULL);
+ if (FAILED(hres))
+ {
+ ERR("Enumerator: no DISPID_NEWENUM.\n");
+ hres = E_INVALIDARG;
+ goto cleanuperr;
+ }
+
+ if ((V_VT(&varresult) == VT_DISPATCH) ||
+ (V_VT(&varresult) == VT_UNKNOWN))
+ {
+ hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult),
+ &IID_IEnumVARIANT, (void**)&enumvar);
+ if (FAILED(hres))
+ {
+ hres = E_INVALIDARG;
+ goto cleanuperr;
+ }
+ }
+ else
+ {
+ ERR("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult));
+ hres = E_INVALIDARG;
+ goto cleanuperr;
+ }
+ VariantClear(&varresult);
+
+ atend = FALSE;
+ }
+ else
+ {
+ ERR("I don't know how to handle this type!\n");
+ hres = E_NOTIMPL;
+ goto cleanuperr;
+ }
hres = alloc_enumerator(ctx, NULL, &enumerator);
if(FAILED(hres))
- return hres;
+ goto cleanuperr;
+
+ enumerator->atend = atend;
+ enumerator->enumvar = enumvar;
+
+ hres = enumvar_get_next_item(enumerator);
+ if (FAILED(hres))
+ goto cleanuperr;
*ret = &enumerator->dispex;
+
return S_OK;
+cleanuperr:
+ VariantClear(&varresult);
+ if (enumerator)
+ heap_free(enumerator);
+ return hres;
}
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index baebcc4b6c..879b2b837b 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -116,6 +116,7 @@ typedef enum {
JSCLASS_ARRAY,
JSCLASS_BOOLEAN,
JSCLASS_DATE,
+ JSCLASS_ENUMERATOR,
JSCLASS_ERROR,
JSCLASS_FUNCTION,
JSCLASS_GLOBAL,
@@ -561,6 +562,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags)
#define JS_E_VBARRAY_EXPECTED MAKE_JSERROR(IDS_NOT_VBARRAY)
#define JS_E_INVALID_DELETE MAKE_JSERROR(IDS_INVALID_DELETE)
#define JS_E_JSCRIPT_EXPECTED MAKE_JSERROR(IDS_JSCRIPT_EXPECTED)
+#define JS_E_ENUMERATOR_EXPECTED MAKE_JSERROR(IDS_NOT_ENUMERATOR)
#define JS_E_REGEXP_SYNTAX MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR)
#define JS_E_INVALID_URI_CODING MAKE_JSERROR(IDS_URI_INVALID_CODING)
#define JS_E_INVALID_URI_CHAR MAKE_JSERROR(IDS_URI_INVALID_CHAR)
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index 19d67b514f..3fa93c7d66 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -69,7 +69,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u
static const WCHAR regexpW[] = {'R','e','g','E','x','p',0};
static const WCHAR stringW[] = {'S','t','r','i','n','g',0};
/* Keep in sync with jsclass_t enum */
- static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW,
+ static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW,
functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW};
TRACE("\n");
diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h
index d15dd7a033..d171ce20f8 100644
--- a/dlls/jscript/resource.h
+++ b/dlls/jscript/resource.h
@@ -56,6 +56,7 @@
#define IDS_INVALID_DELETE 0x1394
#define IDS_NOT_VBARRAY 0x1395
#define IDS_JSCRIPT_EXPECTED 0x1396
+#define IDS_NOT_ENUMERATOR 0x1397
#define IDS_REGEXP_SYNTAX_ERROR 0x1399
#define IDS_URI_INVALID_CHAR 0x13A0
#define IDS_URI_INVALID_CODING 0x13A1
--
2.11.0
More information about the wine-devel
mailing list