diff options
| author | Harald Radi <phanto@php.net> | 2002-05-20 15:35:57 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2002-05-20 15:35:57 +0000 |
| commit | e47a667cc91333627bc07aab42f0a7025181e85e (patch) | |
| tree | 915090669e47e62b7f90dc716d2dd11ef1c54745 /ext/com/conversion.c | |
| parent | 6553e9479137896cef0d5ba2d560088774f49240 (diff) | |
| download | php-git-e47a667cc91333627bc07aab42f0a7025181e85e.tar.gz | |
integrating wez's patch
Diffstat (limited to 'ext/com/conversion.c')
| -rw-r--r-- | ext/com/conversion.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/com/conversion.c b/ext/com/conversion.c index 130885edd9..c9e4f89414 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -56,8 +56,6 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage T case IS_OBJECT: if (!strcmp(Z_OBJCE_P(pval_arg)->name, "VARIANT")) { type = VT_VARIANT|VT_BYREF; - } else if (!strcmp(Z_OBJCE_P(pval_arg)->name, "COM")) { - type = VT_DISPATCH; } else { type = VT_DISPATCH; } @@ -275,8 +273,9 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type, comval_to_variant(pval_arg, var_arg TSRMLS_CC); } else { V_DISPATCH(var_arg) = php_COM_export_object(pval_arg TSRMLS_CC); - if (V_DISPATCH(var_arg)) + if (V_DISPATCH(var_arg)) { V_VT(var_arg) = VT_DISPATCH; + } } if (V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); |