Object overloading API changed slightly (llist is now a pointer)

diff --git a/ext/domxml/domxml.c b/ext/domxml/domxml.c
index 7c397961d0e9a8098b2533abb4bbf9094bebc175..fe02b1651eabeee273c7076d6c0b028482626ae1 100644 (file)
--- a/ext/domxml/domxml.c
+++ b/ext/domxml/domxml.c
@@ -168,7 +168,7 @@ pval domxmltestnode_class_get_property(zend_property_reference *property_referen
 
        printf("Reading a property from a OverloadedTestClass object:\n");
 
-       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:
@@ -206,7 +206,7 @@ int domxmltestnode_class_set_property(zend_property_reference *property_referenc
        zend_print_variable(value);
        printf("'\n");
 
-       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:
@@ -239,7 +239,7 @@ void domxmltestnode_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_prope
 
        printf("Invoking a method on OverloadedTestClass object:\n");
 
-       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:

diff --git a/ext/java/java.c b/ext/java/java.c
index b22911749ad8ae7d9c714e7981a85d3c65babe8c..f2dee2059d10f3b73dae8dce3ea33907fc517db7 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -324,7 +324,7 @@ void java_call_function_handler
 {
   pval *object = property_reference->object;
   zend_overloaded_element *function_name = (zend_overloaded_element *)
-    property_reference->elements_list.tail->data;
+    property_reference->elements_list->tail->data;
 
   int arg_count = ARG_COUNT(ht);
   jlong result = 0;
@@ -393,7 +393,7 @@ static pval _java_getset_property
   int type;
 
   /* get the property name */
-  zend_llist_element *element = property_reference->elements_list.head;
+  zend_llist_element *element = property_reference->elements_list->head;
   zend_overloaded_element *property=(zend_overloaded_element *)element->data;
   jstring propName =
     (*jenv)->NewStringUTF(jenv, property->element.value.str.val);

diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c
index 8be37e64bcb81f01ce48ca9db7f1d57394a58276..9eb6a245cf75799e2aafc28e0521c3396d224823 100644 (file)
--- 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;

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index b22911749ad8ae7d9c714e7981a85d3c65babe8c..f2dee2059d10f3b73dae8dce3ea33907fc517db7 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -324,7 +324,7 @@ void java_call_function_handler
 {
   pval *object = property_reference->object;
   zend_overloaded_element *function_name = (zend_overloaded_element *)
-    property_reference->elements_list.tail->data;
+    property_reference->elements_list->tail->data;
 
   int arg_count = ARG_COUNT(ht);
   jlong result = 0;
@@ -393,7 +393,7 @@ static pval _java_getset_property
   int type;
 
   /* get the property name */
-  zend_llist_element *element = property_reference->elements_list.head;
+  zend_llist_element *element = property_reference->elements_list->head;
   zend_overloaded_element *property=(zend_overloaded_element *)element->data;
   jstring propName =
     (*jenv)->NewStringUTF(jenv, property->element.value.str.val);

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 46478cef216bace7d2f7fa02d3918e6d5105c0db..8ec8e482714c91ad22e2e4988f10ce9c9e030ec9 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1568,7 +1568,7 @@ pval test_class_get_property(zend_property_reference *property_reference)
 
        printf("Reading a property from a OverloadedTestClass object:\n");
 
-       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:
@@ -1606,7 +1606,7 @@ int test_class_set_property(zend_property_reference *property_reference, pval *v
        zend_print_variable(value);
        printf("'\n");
 
-       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:
@@ -1640,7 +1640,7 @@ void test_class_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_refere
 
        printf("Invoking a method on OverloadedTestClass object:\n");
 
-       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:

diff --git a/ext/standard/info.c b/ext/standard/info.c
index b7e900821e403125abce60f57a533f835175f231..086f82762e2f41b067a6fe3fa140c1127e55a545 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -168,10 +168,10 @@ PHPAPI void php_print_info(int flag)
                php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND );
 #endif
                if (sapi_module.name) {
-                       php_info_print_table_row(2, "SAPI", sapi_module.name );
+                       php_info_print_table_row(2, "Server API", sapi_module.name );
                }
 
-               php_info_print_table_row(2, "php.ini Path", CONFIGURATION_FILE_PATH );
+               php_info_print_table_row(2, "Configuration File (php.ini) Path", CONFIGURATION_FILE_PATH );
 
 #if ZEND_DEBUG
                php_info_print_table_row(2, "ZEND_DEBUG", "enabled" );

diff --git a/tests/testcom b/tests/testcom
index 3668424a2955466fdf0fa50cbf4e0764f9b1c082..0feb50d1ff864784a6044a837fd8633ef60c0222 100644 (file)
--- a/tests/testcom
+++ b/tests/testcom
@@ -4,6 +4,8 @@ print "Loaded Word, version {$word->Version}\n";
 $word->Visible = 1;
 $word->Documents->Add();
 $word->Selection->TypeText("This is a test...");
-$word->Documents[1]->SaveAs("Useless test.doc");
 $word->Quit();
+/*
+$word->Documents[1]->SaveAs("Useless test.doc");
+*/
 ?>
\ No newline at end of file