Module: wine Branch: master Commit: 93e6ca87479ed9688c88d67614637be60250842a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e6ca87479ed9688c88d67614...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Oct 1 13:54:42 2010 +0200
jscript: Don't use to_object for nullDisp in Object function.
---
dlls/jscript/object.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 05eb509..bbb0372 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -186,7 +186,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(arg_cnt(dp)) { VARIANT *arg = get_arg(dp,0);
- if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL) { + if(V_VT(arg) != VT_EMPTY && V_VT(arg) != VT_NULL && (V_VT(arg) != VT_DISPATCH || V_DISPATCH(arg))) { IDispatch *disp;
hres = to_object(ctx, arg, &disp);