cvs: php4 /ext/com COM.c VARIANT.c

andi Sat Jul 28 14:55:49 2001 EDT Modified files: /php4/ext/com COM.c VARIANT.c Log: - More Object macro work. I couldn't test this one so let me know if it breaks the Windows build. Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.32 php4/ext/com/COM.c:1.33 --- php4/ext/com/COM.c:1.32 Sat Jul 28 07:35:43 2001 +++ php4/ext/com/COM.c Sat Jul 28 14:55:48 2001 @@ -1155,7 +1155,7 @@ ZVAL_NULL(&return_value); /* fetch the IDispatch interface */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &comval_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); obj = (comval *) zend_list_find(Z_LVAL_P(*comval_handle), &type); if(!obj || (type != IS_COM)) { @@ -1246,7 +1246,7 @@ /* fetch the IDispatch interface */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &comval_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); obj = (comval *)zend_list_find(Z_LVAL_P(*comval_handle), &type); if(!obj || (type != IS_COM)) { @@ -1319,7 +1319,7 @@ *object_handle = *return_value; pval_copy_constructor(object_handle); INIT_PZVAL(object_handle); - zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL); + zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL); pval_destructor(&function_name->element); return; @@ -1335,8 +1335,8 @@ pval_destructor(&function_name->element); return; } - zend_hash_index_find(property.value.obj.properties, 0, (void **) &handle); - obj = (comval *)zend_list_find((*handle)->value.lval,&type); + zend_hash_index_find(Z_OBJPROP(property), 0, (void **) &handle); + obj = (comval *)zend_list_find(Z_LVAL_PP(handle), &type); if(!obj || (type != IS_COM)) { @@ -1674,8 +1674,8 @@ getParameters(ht, 1, &object); /* obtain IDispatch interface */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &comval_handle); - obj = (comval *) zend_list_find((*comval_handle)->value.lval, &type); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); + obj = (comval *) zend_list_find(Z_LVAL_PP(comval_handle), &type); if(!obj || (type != IS_COM)) { php_error(E_WARNING,"%s is not a COM object handler", ""); Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.15 php4/ext/com/VARIANT.c:1.16 --- php4/ext/com/VARIANT.c:1.15 Wed Jul 11 08:42:21 2001 +++ php4/ext/com/VARIANT.c Sat Jul 28 14:55:48 2001 @@ -169,8 +169,8 @@ *object_handle = *return_value; pval_copy_constructor(object_handle); INIT_PZVAL(object_handle); - zend_hash_index_update(object->value.obj.properties, 0, &object_handle, sizeof(pval *), NULL); - pval_destructor(&function_name->element); + zend_hash_index_update(Z_OBJPROP_P(object), 0, &object_handle, sizeof(pval *), NULL); + zval_dtor(&function_name->element); } } @@ -184,7 +184,7 @@ VARIANT *var_arg; /* fetch the VARIANT structure */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &var_handle); var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type); if(!var_arg || (type != IS_VARIANT)) @@ -220,7 +220,7 @@ php_error(E_WARNING, "Unknown method."); break; - pval_destructor(&overloaded_property->element); + zval_dtor(&overloaded_property->element); } } @@ -236,7 +236,7 @@ VARIANT *var_arg; /* fetch the VARIANT structure */ - zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle); + zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &var_handle); var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type); if(!var_arg || (type != IS_VARIANT)) @@ -244,7 +244,7 @@ overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data; do_VARIANT_propset(var_arg, &overloaded_property->element, value); - pval_destructor(&overloaded_property->element); + zval_dtor(&overloaded_property->element); return SUCCESS; }