cvs: php4 /ext/com com.h conversion.c

andi Sun Aug 12 00:31:13 2001 EDT Modified files: /php4/ext/com com.h conversion.c Log: - Make com work with new object model Index: php4/ext/com/com.h diff -u php4/ext/com/com.h:1.8 php4/ext/com/com.h:1.9 --- php4/ext/com/com.h:1.8 Sat Jul 28 15:23:20 2001 +++ php4/ext/com/com.h Sun Aug 12 00:31:12 2001 @@ -21,20 +21,18 @@ #define ZVAL_COM(z,o) { \ zval *handle; \ + HashTable *properties; \ \ - /* OBJECTS_FIXME */ \ - Z_TYPE_P(z) = IS_OBJECT; \ - Z_OBJCE_P(z) = &com_class_entry; \ - \ - ALLOC_HASHTABLE(Z_OBJPROP_P(z)); \ - zend_hash_init(Z_OBJPROP_P(z), 0, NULL, ZVAL_PTR_DTOR, 0); \ + ALLOC_HASHTABLE(properties); \ + zend_hash_init(properties, 0, NULL, ZVAL_PTR_DTOR, 0); \ \ ALLOC_ZVAL(handle); \ INIT_PZVAL(handle); \ ZVAL_LONG(handle, zend_list_insert((o), IS_COM)); \ \ zval_copy_ctor(handle); \ - zend_hash_index_update(Z_OBJPROP_P(z), 0, &handle, sizeof(zval *), NULL); \ + zend_hash_index_update(properties, 0, &handle, sizeof(zval *), NULL); \ + object_and_properties_init(z, &com_class_entry, properties); \ } #define RETVAL_COM(o) ZVAL_COM(&return_value, o) Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.29 php4/ext/com/conversion.c:1.30 --- php4/ext/com/conversion.c:1.29 Sat Aug 11 12:38:20 2001 +++ php4/ext/com/conversion.c Sun Aug 12 00:31:12 2001 @@ -758,6 +758,8 @@ } else { + TSRMLS_FETCH(); + ALLOC_COM(obj); php_COM_set(obj, V_DISPATCH(var_arg), TRUE);