cvs: php4 /ext/com COM.c variant.h

phanto Sat Sep 8 16:40:55 2001 EDT Modified files: /php4/ext/com COM.c variant.h Log: com_*() functions returned an oo-resource instead of an resource id, thus subsequent com_*() calls to com-returnvalues failed. Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.52 php4/ext/com/COM.c:1.53 --- php4/ext/com/COM.c:1.52 Tue Sep 4 17:46:26 2001 +++ php4/ext/com/COM.c Sat Sep 8 16:40:55 2001 @@ -804,9 +804,8 @@ RETURN_FALSE; } - php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); + RETVAL_VARIANT(var_result); - FREE_VARIANT(var_result); efree(arguments); } /* }}} */ @@ -1049,9 +1048,7 @@ RETURN_FALSE; } - php_variant_to_pval(var_result, return_value, codepage TSRMLS_CC); - - FREE_VARIANT(var_result); + RETVAL_VARIANT(var_result); } /* }}} */ @@ -1201,8 +1198,7 @@ pval_destructor(&overloaded_property->element); } - if (obj_prop != NULL) - { + if (obj_prop != NULL) { RETVAL_COM(obj); } Index: php4/ext/com/variant.h diff -u php4/ext/com/variant.h:1.2 php4/ext/com/variant.h:1.3 --- php4/ext/com/variant.h:1.2 Mon Aug 13 19:39:10 2001 +++ php4/ext/com/variant.h Sat Sep 8 16:40:55 2001 @@ -3,14 +3,29 @@ #if PHP_WIN32 -#define ALLOC_VARIANT(v) (v) = (VARIANT *) emalloc(sizeof(VARIANT)); \ +#define ALLOC_VARIANT(v) (v) = (VARIANT *) emalloc(sizeof(VARIANT)); \ VariantInit(v); -#define FREE_VARIANT(v) VariantClear(v); \ +#define FREE_VARIANT(v) VariantClear(v); \ efree(v); #define IS_VARIANT php_VARIANT_get_le_variant() + +#define ZVAL_VARIANT(z, v) if (V_VT(v) == VT_DISPATCH) { \ + comval *obj; \ + ALLOC_COM(obj); \ + php_COM_set(obj, &V_DISPATCH(v), TRUE TSRMLS_CC); \ + ZVAL_LONG((z), zend_list_insert(obj, IS_COM)); \ + } else { \ + php_variant_to_pval((v), (z), codepage TSRMLS_CC); \ + FREE_VARIANT(v); \ + } + +#define RETVAL_VARIANT(v) ZVAL_VARIANT(return_value, (v)); +#define RETURN_VARIANT(v) RETVAL_VARIANT(v) \ + return; + #endif /* PHP_WIN32 */