summaryrefslogtreecommitdiff
path: root/ext/com/conversion.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/com/conversion.c')
-rw-r--r--ext/com/conversion.c5
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);