diff options
Diffstat (limited to 'ext/com')
| -rw-r--r-- | ext/com/COM.c | 2 | ||||
| -rw-r--r-- | ext/com/VARIANT.c | 10 | ||||
| -rw-r--r-- | ext/com/conversion.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index be5883270b..7304f68676 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -1321,7 +1321,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro PHP_FN(com_load)(INTERNAL_FUNCTION_PARAM_PASSTHRU); if(!zend_is_true(return_value)) { - ZVAL_RESET(object); + ZVAL_BOOL(object, 0); return; } ALLOC_ZVAL(object_handle); diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c index 7daeac1172..681bf4f4d1 100644 --- a/ext/com/VARIANT.c +++ b/ext/com/VARIANT.c @@ -161,7 +161,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper if(!zend_is_true(return_value)) { - ZVAL_RESET(object); + ZVAL_BOOL(object, 0); return; } @@ -189,7 +189,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc if(!var_arg || (type != IS_VARIANT)) { - ZVAL_RESET(&result); + ZVAL_BOOL(&result, 0); } else { @@ -197,7 +197,7 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc switch(overloaded_property->type) { case OE_IS_ARRAY: - ZVAL_RESET(&result); + ZVAL_BOOL(&result, 0); break; case OE_IS_OBJECT: @@ -211,12 +211,12 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc } else { - ZVAL_RESET(&result); + ZVAL_BOOL(&result, 0); php_error(E_WARNING, "Unknown member."); } break; case OE_IS_METHOD: - ZVAL_RESET(&result); + ZVAL_BOOL(&result, 0); php_error(E_WARNING, "Unknown method."); break; diff --git a/ext/com/conversion.c b/ext/com/conversion.c index 9c7feaaa2c..1b523a59b5 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -127,7 +127,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage) if(NULL == safeArray) { php_error( E_WARNING,"Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)"); - ZVAL_RESET(pval_arg); + ZVAL_BOOL(pval_arg, 0); } else { @@ -473,7 +473,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, if (1 != (Dims = SafeArrayGetDim(array))) { php_error(E_WARNING,"Unsupported: multi-dimensional (%d) SafeArrays", Dims); - ZVAL_RESET(pval_arg); + ZVAL_BOOL(pval_arg, 0); return FAILURE; } SafeArrayLock( array); |