jscript: Don't use to_object for nullDisp in Object function.

93e6ca87 · Jacek Caban · Alexandre Julliard · a15301a0 · 93e6ca87
Commit 93e6ca87 authored Oct 01, 2010 by Jacek Caban Committed by Alexandre Julliard Oct 01, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

object.c dlls/jscript/object.c +1 -1

No files found.
--- 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);