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

jscript: Correctly throw an exception if instanceof expression is not used on function.

This commit is contained in:
Jacek Caban 2011-06-21 17:46:04 +02:00 committed by Alexandre Julliard
parent 42c2bd7bd9
commit a7cc9441e9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/jscript/engine.c
View File

@ -2001,15 +2001,14 @@ static HRESULT instanceof_eval(script_ctx_t *ctx, VARIANT *inst, VARIANT *objv,
obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv)); obj = iface_to_jsdisp((IUnknown*)V_DISPATCH(objv));
if(!obj) { if(!obj) {
FIXME("throw TypeError\n"); FIXME("non-jsdisp objects not supported\n");
return E_FAIL; return E_FAIL;
} }
if(is_class(obj, JSCLASS_FUNCTION)) { if(is_class(obj, JSCLASS_FUNCTION)) {
hres = jsdisp_propget_name(obj, prototypeW, &var, ei, NULL/*FIXME*/); hres = jsdisp_propget_name(obj, prototypeW, &var, ei, NULL/*FIXME*/);
}else { }else {
FIXME("throw TypeError\n"); hres = throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL);
hres = E_FAIL;
} }
jsdisp_release(obj); jsdisp_release(obj);
if(FAILED(hres)) if(FAILED(hres))

1
dlls/jscript/tests/api.js
View File

@ -1982,6 +1982,7 @@ testException(function() {(new Number(3)).toString(1);}, "E_INVALID_CALL_ARG");
testException(function() {not_existing_variable.something();}, "E_UNDEFINED"); testException(function() {not_existing_variable.something();}, "E_UNDEFINED");
testException(function() {date();}, "E_NOT_FUNC"); testException(function() {date();}, "E_NOT_FUNC");
testException(function() {arr();}, "E_NOT_FUNC"); testException(function() {arr();}, "E_NOT_FUNC");
testException(function() {(new Object) instanceof (new Object);}, "E_NOT_FUNC");
testException(function() {eval("nonexistingfunc()")}, "E_OBJECT_EXPECTED"); testException(function() {eval("nonexistingfunc()")}, "E_OBJECT_EXPECTED");
testException(function() {(new Object()) instanceof 3;}, "E_NOT_FUNC"); testException(function() {(new Object()) instanceof 3;}, "E_NOT_FUNC");
testException(function() {(new Object()) instanceof null;}, "E_NOT_FUNC"); testException(function() {(new Object()) instanceof null;}, "E_NOT_FUNC");