Jacek Caban : jscript: Return "undefined" type for invalid references.
Alexandre Julliard
julliard at winehq.org
Thu Aug 27 10:31:25 CDT 2009
Module: wine
Branch: master
Commit: 9c18f6ef5d84bc2470c5f90988832a1ec5f69282
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c18f6ef5d84bc2470c5f90988832a1ec5f69282
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 27 01:21:56 2009 +0200
jscript: Return "undefined" type for invalid references.
---
dlls/jscript/engine.c | 59 ++++++++++++++++++++++++++++---------------
dlls/jscript/tests/lang.js | 2 +
2 files changed, 40 insertions(+), 21 deletions(-)
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index d314de6..96117f2 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2228,11 +2228,8 @@ HRESULT void_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags,
}
/* ECMA-262 3rd Edition 11.4.3 */
-HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+static HRESULT typeof_exprval(exec_ctx_t *ctx, exprval_t *exprval, jsexcept_t *ei, const WCHAR **ret)
{
- unary_expression_t *expr = (unary_expression_t*)_expr;
- const WCHAR *str;
- exprval_t exprval;
VARIANT val;
HRESULT hres;
@@ -2243,57 +2240,77 @@ HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags
static const WCHAR stringW[] = {'s','t','r','i','n','g',0};
static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0};
- TRACE("\n");
-
- hres = expr_eval(ctx, expr->expression, 0, ei, &exprval);
- if(FAILED(hres))
- return hres;
+ if(exprval->type == EXPRVAL_INVALID) {
+ *ret = undefinedW;
+ return S_OK;
+ }
- hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val);
- exprval_release(&exprval);
+ hres = exprval_to_value(ctx->parser->script, exprval, ei, &val);
if(FAILED(hres))
return hres;
switch(V_VT(&val)) {
case VT_EMPTY:
- str = undefinedW;
+ *ret = undefinedW;
break;
case VT_NULL:
- str = objectW;
+ *ret = objectW;
break;
case VT_BOOL:
- str = booleanW;
+ *ret = booleanW;
break;
case VT_I4:
case VT_R8:
- str = numberW;
+ *ret = numberW;
break;
case VT_BSTR:
- str = stringW;
+ *ret = stringW;
break;
case VT_DISPATCH: {
DispatchEx *dispex;
dispex = iface_to_jsdisp((IUnknown*)V_DISPATCH(&val));
if(dispex) {
- str = dispex->builtin_info->class == JSCLASS_FUNCTION ? functionW : objectW;
- IDispatchEx_Release(_IDispatchEx_(dispex));
+ *ret = is_class(dispex, JSCLASS_FUNCTION) ? functionW : objectW;
+ jsdisp_release(dispex);
}else {
- str = objectW;
+ *ret = objectW;
}
break;
}
default:
FIXME("unhandled vt %d\n", V_VT(&val));
- VariantClear(&val);
- return E_NOTIMPL;
+ hres = E_NOTIMPL;
}
VariantClear(&val);
+ return S_OK;
+}
+
+HRESULT typeof_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+{
+ unary_expression_t *expr = (unary_expression_t*)_expr;
+ const WCHAR *str = NULL;
+ exprval_t exprval;
+ HRESULT hres;
+
+ TRACE("\n");
+
+ hres = expr_eval(ctx, expr->expression, 0, ei, &exprval);
+ if(FAILED(hres))
+ return hres;
+
+ hres = typeof_exprval(ctx, &exprval, ei, &str);
+ exprval_release(&exprval);
+ if(FAILED(hres))
+ return hres;
ret->type = EXPRVAL_VARIANT;
V_VT(&ret->u.var) = VT_BSTR;
V_BSTR(&ret->u.var) = SysAllocString(str);
+ if(!V_BSTR(&ret->u.var))
+ return E_OUTOFMEMORY;
+
return S_OK;
}
diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js
index 8ab4d1e..56f71d6 100644
--- a/dlls/jscript/tests/lang.js
+++ b/dlls/jscript/tests/lang.js
@@ -905,4 +905,6 @@ function do_test() {}
function nosemicolon() {} nosemicolon();
function () {} nosemicolon();
+ok(typeof(doesnotexist) === "undefined", "typeof(doesnotexist) = " + typeof(doesnotexist));
+
reportSuccess();
More information about the wine-cvs
mailing list