diff options
Diffstat (limited to 'ext/rpc/com/COM.c')
| -rw-r--r-- | ext/rpc/com/COM.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 8be37e64bc..9eb6a245cf 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -788,11 +788,11 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer var_result.vt = VT_DISPATCH; var_result.pdispVal = i_dispatch; - for (element=property_reference->elements_list.head; element; element=element->next) { + for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: - if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list.head)==FAILURE) { + if (do_COM_offget(&var_result, &var_result, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) { /* bail out */ } /*printf("Array offset: ");*/ @@ -801,7 +801,7 @@ VARIANTARG _php_COM_get_property_handler(zend_property_reference *property_refer if (var_result.vt != VT_DISPATCH) { /* bail out */ } else { - if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list.head)==FAILURE) { + if (do_COM_propget(&var_result, var_result.pdispVal, &overloaded_property->element, element!=property_reference->elements_list->head)==FAILURE) { /* bail out */ } /*printf("Object property: ");*/ @@ -858,7 +858,7 @@ int php_COM_set_property_handler(zend_property_reference *property_reference, pv var_result.vt = VT_DISPATCH; var_result.pdispVal = i_dispatch; - for (element=property_reference->elements_list.head; element && element!=property_reference->elements_list.tail; element=element->next) { + for (element=property_reference->elements_list->head; element && element!=property_reference->elements_list->tail; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; switch (overloaded_property->type) { case OE_IS_ARRAY: @@ -868,7 +868,7 @@ int php_COM_set_property_handler(zend_property_reference *property_reference, pv if (var_result.vt != VT_DISPATCH) { /* bail out */ } else { - do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list.head); + do_COM_propget(&var_result, i_dispatch, &overloaded_property->element, element!=property_reference->elements_list->head); /*printf("Object property: ");*/ } break; @@ -904,9 +904,9 @@ void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_r { zend_overloaded_element *overloaded_property; pval *object = property_reference->object; - zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list.tail->data; + zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data; - if (zend_llist_count(&property_reference->elements_list)==1 + if (zend_llist_count(property_reference->elements_list)==1 && !strcmp(function_name->element.value.str.val, "com")) { /* constructor */ pval *object_handle; @@ -942,9 +942,9 @@ void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_r php_variant_to_pval(&var_result, return_value, 0); } - for (overloaded_property = (zend_overloaded_element *) zend_llist_get_first(&property_reference->elements_list); + for (overloaded_property = (zend_overloaded_element *) zend_llist_get_first(property_reference->elements_list); overloaded_property; - overloaded_property = (zend_overloaded_element *) zend_llist_get_next(&property_reference->elements_list)) { + overloaded_property = (zend_overloaded_element *) zend_llist_get_next(property_reference->elements_list)) { switch (overloaded_property->type) { case OE_IS_ARRAY: break; |
