com php/gtk-src: More tsrmls_fetch work: ext/gtk+/gtktr eeview.overrides ext/gtk+/php_gtk+_types.c ext/gtk+ /phpg_custom_tree_model.c main/php_gtk.h
| From: | Elizabeth Marie Smith | Date: | Wed, 18 Jul 2012 15:53:14 +0000 |
| Subject: | com php/gtk-src: More tsrmls_fetch work: ext/gtk+/gtktr eeview.overrides ext/gtk+/php_gtk+_types.c ext/gtk+ /phpg_custom_tree_model.c main/php_gtk.h | ||
| Groups: | php.gtk.cvs | ||
| Request: | Send a blank email to php-gtk-cvs+get-4868@lists.php.net to get a copy of this message | ||
Commit: 0c07e8033566f64000661c698ad6cde4fbf56210
Author: Elizabeth M Smith <auroraeosrose@gmail.com> Wed, 18 Jul 2012 11:53:14 -0400
Parents: d972807a2eb0a5ac045ba983ac3f93d7d365b8f1
Branches: master
Link: http://git.php.net/?p=php/gtk-src.git;a=commitdiff;h=0c07e8033566f64000661c698ad6cde4fbf56210
Log:
More tsrmls_fetch work
Changed paths:
M ext/gtk+/gtktreeview.overrides
M ext/gtk+/php_gtk+_types.c
M ext/gtk+/phpg_custom_tree_model.c
M main/php_gtk.h
diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides index 68f18a4..ed17447 100644 --- a/ext/gtk+/gtktreeview.overrides +++ b/ext/gtk+/gtktreeview.overrides @@ -774,20 +774,20 @@ PHP_METHOD column_types = emalloc(argc * sizeof(GType)); for (i = 0; i < argc; i++) { - column_types[i] = phpg_gtype_from_zval(*args[i]); + column_types[i] = phpg_gtype_from_zval(*args[i] TSRMLS_CC); if (column_types[i] == 0) { efree(column_types); - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore TSRMLS_CC); } } - wrapped_obj = g_object_newv(phpg_gtype_from_zval(this_ptr), 0, NULL); + wrapped_obj = g_object_newv(phpg_gtype_from_zval(this_ptr TSRMLS_CC), 0, NULL); gtk_tree_store_set_column_types(GTK_TREE_STORE(wrapped_obj), argc, column_types); efree(column_types); efree(args); } else { - wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (!wrapped_obj) { @@ -823,7 +823,7 @@ PHP_METHOD zend_hash_get_current_data(Z_ARRVAL_P(php_types), (void**)&item) == SUCCESS; zend_hash_move_forward(Z_ARRVAL_P(php_types)), i++) { - column_types[i] = phpg_gtype_from_zval(*item); + column_types[i] = phpg_gtype_from_zval(*item TSRMLS_CC); if (column_types[i] == 0) { efree(column_types); php_error(E_WARNING, "could not set column types for GtkTreeStore"); @@ -1588,7 +1588,7 @@ PHP_METHOD return; } - wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr), + wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "child-model", GTK_TREE_MODEL(PHPG_GOBJECT(php_model)), "virtual-root", path, NULL); @@ -1598,7 +1598,7 @@ PHP_METHOD } if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter TSRMLS_CC); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -2922,7 +2922,7 @@ PHP_METHOD } } - tvc = GTK_TREE_VIEW_COLUMN(g_object_new(phpg_gtype_from_zval(this_ptr), NULL)); + tvc = GTK_TREE_VIEW_COLUMN(g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL)); if (php_cell && Z_TYPE_P(php_cell) != IS_NULL) { cell = GTK_CELL_RENDERER(PHPG_GOBJECT(php_cell)); } diff --git a/ext/gtk+/php_gtk+_types.c b/ext/gtk+/php_gtk+_types.c index 8f708b1..b123931 100644 --- a/ext/gtk+/php_gtk+_types.c +++ b/ext/gtk+/php_gtk+_types.c @@ -1353,7 +1353,7 @@ zval *php_gdk_event_new(GdkEvent *event) add_property_long(result, "type", event->type); if (event->any.window) { - value = php_gdk_window_new(event->any.window); + value = php_gdk_window_new(event->any.window TSRMLS_CC); add_property_zval(result, "window", value); } else add_property_null(result, "window"); @@ -1414,7 +1414,7 @@ zval *php_gdk_event_new(GdkEvent *event) case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: if (event->crossing.subwindow) { - value = php_gdk_window_new(event->crossing.subwindow); + value = php_gdk_window_new(event->crossing.subwindow TSRMLS_CC)); add_property_zval(result, "subwindow", value); } else add_property_null(result, "subwindow"); @@ -1923,11 +1923,10 @@ static function_entry php_gdk_pixmap_functions[] = { {NULL, NULL, NULL} }; -zval *php_gdk_window_new(GdkWindow *window) +zval *php_gdk_window_new(GdkWindow *window TSRMLS_DC)) { zval *result; zval **wrapper_ptr; - TSRMLS_FETCH(); if (!window) { MAKE_STD_ZVAL(result); @@ -2056,10 +2055,10 @@ static void gdk_window_get_property(zval *return_value, zval *object, char *prop } else if (!strcmp(prop_name, "parent")) { GdkWindow *parent = gdk_window_get_parent(win); if (parent) - *return_value = *php_gdk_window_new(parent); + *return_value = *php_gdk_window_new(parent TSRMLS_CC)); return; } else if (!strcmp(prop_name, "toplevel")) { - *return_value = *php_gdk_window_new(gdk_window_get_toplevel(win)); + *return_value = *php_gdk_window_new(gdk_window_get_toplevel(win) TSRMLS_CC)); return; } else if (!strcmp(prop_name, "children")) { GList *children, *tmp; @@ -2067,7 +2066,7 @@ static void gdk_window_get_property(zval *return_value, zval *object, char *prop children = gdk_window_get_children(win); array_init(return_value); for (tmp = children; tmp; tmp = tmp->next) { - child = php_gdk_window_new(tmp->data); + child = php_gdk_window_new(tmp->data TSRMLS_CC)); zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &child, sizeof(zval *), NULL); } g_list_free(children); @@ -2934,11 +2933,11 @@ static void gdk_drag_context_get_property(zval *return_value, zval *object, char RETURN_BOOL(context->is_source); } else if (!strcmp(prop_name, "source_window")) { if (context->source_window) - *return_value = *php_gdk_window_new(context->source_window); + *return_value = *php_gdk_window_new(context->source_window TSRMLS_CC)); return; } else if (!strcmp(prop_name, "dest_window")) { if (context->dest_window) - *return_value = *php_gdk_window_new(context->dest_window); + *return_value = *php_gdk_window_new(context->dest_window TSRMLS_CC)); return; } else if (!strcmp(prop_name, "targets")) { GList *tmp; diff --git a/ext/gtk+/phpg_custom_tree_model.c b/ext/gtk+/phpg_custom_tree_model.c index c3b2a4a..362e5f0 100644 --- a/ext/gtk+/phpg_custom_tree_model.c +++ b/ext/gtk+/phpg_custom_tree_model.c @@ -236,7 +236,7 @@ static GType phpg_custom_tree_model_get_column_type(GtkTreeModel *tree_model, gi if (call_user_function_ex(EG(function_table), &wrapper, &method_name, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { - result = phpg_gtype_from_zval(retval); + result = phpg_gtype_from_zval(retval TSRMLS_CC); zval_ptr_dtor(&retval); } else { php_error(E_WARNING, "Could not invoke on_get_column_type handler"); diff --git a/main/php_gtk.h b/main/php_gtk.h index 0e31e2e..de37f1d 100644 --- a/main/php_gtk.h +++ b/main/php_gtk.h @@ -329,7 +329,7 @@ void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference PHP_GTK_API zend_class_entry* phpg_register_class(const char *class_name, zend_function_entry *class_functions, zend_class_entry *parent, zend_uint ce_flags, prop_info_t *prop_info, create_object_func_t create_obj_func, GType gtype TSRMLS_DC); PHP_GTK_API zend_class_entry* phpg_register_interface(const char *iface_name, zend_function_entry *iface_methods, GType gtype TSRMLS_DC); -PHP_GTK_API zend_class_entry* phpg_create_class(GType gtype); +PHP_GTK_API zend_class_entry* phpg_create_class(GType gtype TSRMLS_DC); PHP_GTK_API void phpg_init_object(void *pobj, zend_class_entry *ce TSRMLS_DC); PHP_GTK_API zend_bool phpg_parse_ctor_props(GType gtype, zval **php_args, GParameter *params, guint *n_params, char **prop_names TSRMLS_DC); @@ -370,13 +370,13 @@ static inline zend_bool phpg_object_isa(zval *zobj, zend_class_entry *ce TSRMLS_ return TRUE; } -static inline zend_class_entry* phpg_class_from_gtype(GType gtype) +static inline zend_class_entry* phpg_class_from_gtype(GType gtype TSRMLS_DC) { zend_class_entry *ce = NULL; ce = g_type_get_qdata(gtype, phpg_class_key); if (!ce) { - ce = phpg_create_class(gtype); + ce = phpg_create_class(gtype TSRMLS_CC); } assert(ce != NULL); @@ -435,22 +435,15 @@ static inline gchar* phpg_from_utf8(const gchar *str, zend_uint str_len, gsize * } #define PHPG_THROW_EXCEPTION(exception, message) \ - do { \ - TSRMLS_FETCH(); \ zend_throw_exception(exception, message, 0 TSRMLS_CC); \ - return; \ - } while (0) + return; #define PHPG_THROW_CONSTRUCT_EXCEPTION(type) \ PHPG_THROW_EXCEPTION(phpg_construct_exception, "could not construct " #type " object"); #define PHPG_THROW_EXCEPTION_WITH_RETURN(exception, message, retval) \ - do { \ - TSRMLS_FETCH(); \ zend_throw_exception(exception, message, 0 TSRMLS_CC); \ return retval; \ - } while (0) - #define MAKE_ZVAL_IF_NULL(z) \ do { \ @@ -458,7 +451,7 @@ static inline gchar* phpg_from_utf8(const gchar *str, zend_uint str_len, gsize * } while (0); -void phpg_register_exceptions(); +void phpg_register_exceptions(TSRMLS_D); gboolean phpg_handler_marshal(gpointer user_data); PHP_GTK_API zval* phpg_throw_gerror_exception(const char *domain, long code, const char *message TSRMLS_DC); @@ -474,7 +467,7 @@ PHP_GTK_API void phpg_register_string_constant(zend_class_entry *ce, char *name, void phpg_gtype_register_self(TSRMLS_D); PHP_GTK_API void phpg_gtype_new(zval *zobj, GType type TSRMLS_DC); -PHP_GTK_API GType phpg_gtype_from_zval(zval *value); +PHP_GTK_API GType phpg_gtype_from_zval(zval *value TSRMLS_DC); PHP_GTK_API GType phpg_gtype_from_class(zend_class_entry *ce TSRMLS_DC);
diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides index 68f18a4..ed17447 100644 --- a/ext/gtk+/gtktreeview.overrides +++ b/ext/gtk+/gtktreeview.overrides @@ -774,20 +774,20 @@ PHP_METHOD column_types = emalloc(argc * sizeof(GType)); for (i = 0; i < argc; i++) { - column_types[i] = phpg_gtype_from_zval(*args[i]); + column_types[i] = phpg_gtype_from_zval(*args[i] TSRMLS_CC); if (column_types[i] == 0) { efree(column_types); - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore TSRMLS_CC); } } - wrapped_obj = g_object_newv(phpg_gtype_from_zval(this_ptr), 0, NULL); + wrapped_obj = g_object_newv(phpg_gtype_from_zval(this_ptr TSRMLS_CC), 0, NULL); gtk_tree_store_set_column_types(GTK_TREE_STORE(wrapped_obj), argc, column_types); efree(column_types); efree(args); } else { - wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (!wrapped_obj) { @@ -823,7 +823,7 @@ PHP_METHOD zend_hash_get_current_data(Z_ARRVAL_P(php_types), (void**)&item) == SUCCESS; zend_hash_move_forward(Z_ARRVAL_P(php_types)), i++) { - column_types[i] = phpg_gtype_from_zval(*item); + column_types[i] = phpg_gtype_from_zval(*item TSRMLS_CC); if (column_types[i] == 0) { efree(column_types); php_error(E_WARNING, "could not set column types for GtkTreeStore"); @@ -1588,7 +1588,7 @@ PHP_METHOD return; } - wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr), + wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "child-model", GTK_TREE_MODEL(PHPG_GOBJECT(php_model)), "virtual-root", path, NULL); @@ -1598,7 +1598,7 @@ PHP_METHOD } if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter TSRMLS_CC); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -2922,7 +2922,7 @@ PHP_METHOD } } - tvc = GTK_TREE_VIEW_COLUMN(g_object_new(phpg_gtype_from_zval(this_ptr), NULL)); + tvc = GTK_TREE_VIEW_COLUMN(g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL)); if (php_cell && Z_TYPE_P(php_cell) != IS_NULL) { cell = GTK_CELL_RENDERER(PHPG_GOBJECT(php_cell)); } diff --git a/ext/gtk+/php_gtk+_types.c b/ext/gtk+/php_gtk+_types.c index 8f708b1..b123931 100644 --- a/ext/gtk+/php_gtk+_types.c +++ b/ext/gtk+/php_gtk+_types.c @@ -1353,7 +1353,7 @@ zval *php_gdk_event_new(GdkEvent *event) add_property_long(result, "type", event->type); if (event->any.window) { - value = php_gdk_window_new(event->any.window); + value = php_gdk_window_new(event->any.window TSRMLS_CC); add_property_zval(result, "window", value); } else add_property_null(result, "window"); @@ -1414,7 +1414,7 @@ zval *php_gdk_event_new(GdkEvent *event) case GDK_ENTER_NOTIFY: case GDK_LEAVE_NOTIFY: if (event->crossing.subwindow) { - value = php_gdk_window_new(event->crossing.subwindow); + value = php_gdk_window_new(event->crossing.subwindow TSRMLS_CC)); add_property_zval(result, "subwindow", value); } else add_property_null(result, "subwindow"); @@ -1923,11 +1923,10 @@ static function_entry php_gdk_pixmap_functions[] = { {NULL, NULL, NULL} }; -zval *php_gdk_window_new(GdkWindow *window) +zval *php_gdk_window_new(GdkWindow *window TSRMLS_DC)) { zval *result; zval **wrapper_ptr; - TSRMLS_FETCH(); if (!window) { MAKE_STD_ZVAL(result); @@ -2056,10 +2055,10 @@ static void gdk_window_get_property(zval *return_value, zval *object, char *prop } else if (!strcmp(prop_name, "parent")) { GdkWindow *parent = gdk_window_get_parent(win); if (parent) - *return_value = *php_gdk_window_new(parent); + *return_value = *php_gdk_window_new(parent TSRMLS_CC)); return; } else if (!strcmp(prop_name, "toplevel")) { - *return_value = *php_gdk_window_new(gdk_window_get_toplevel(win)); + *return_value = *php_gdk_window_new(gdk_window_get_toplevel(win) TSRMLS_CC)); return; } else if (!strcmp(prop_name, "children")) { GList *children, *tmp; @@ -2067,7 +2066,7 @@ static void gdk_window_get_property(zval *return_value, zval *object, char *prop children = gdk_window_get_children(win); array_init(return_value); for (tmp = children; tmp; tmp = tmp->next) { - child = php_gdk_window_new(tmp->data); + child = php_gdk_window_new(tmp->data TSRMLS_CC)); zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &child, sizeof(zval *), NULL); } g_list_free(children); @@ -2934,11 +2933,11 @@ static void gdk_drag_context_get_property(zval *return_value, zval *object, char RETURN_BOOL(context->is_source); } else if (!strcmp(prop_name, "source_window")) { if (context->source_window) - *return_value = *php_gdk_window_new(context->source_window); + *return_value = *php_gdk_window_new(context->source_window TSRMLS_CC)); return; } else if (!strcmp(prop_name, "dest_window")) { if (context->dest_window) - *return_value = *php_gdk_window_new(context->dest_window); + *return_value = *php_gdk_window_new(context->dest_window TSRMLS_CC)); return; } else if (!strcmp(prop_name, "targets")) { GList *tmp; diff --git a/ext/gtk+/phpg_custom_tree_model.c b/ext/gtk+/phpg_custom_tree_model.c index c3b2a4a..362e5f0 100644 --- a/ext/gtk+/phpg_custom_tree_model.c +++ b/ext/gtk+/phpg_custom_tree_model.c @@ -236,7 +236,7 @@ static GType phpg_custom_tree_model_get_column_type(GtkTreeModel *tree_model, gi if (call_user_function_ex(EG(function_table), &wrapper, &method_name, &retval, 1, args, 0, NULL TSRMLS_CC) == SUCCESS && retval) { - result = phpg_gtype_from_zval(retval); + result = phpg_gtype_from_zval(retval TSRMLS_CC); zval_ptr_dtor(&retval); } else { php_error(E_WARNING, "Could not invoke on_get_column_type handler"); diff --git a/main/php_gtk.h b/main/php_gtk.h index 0e31e2e..de37f1d 100644 --- a/main/php_gtk.h +++ b/main/php_gtk.h @@ -329,7 +329,7 @@ void php_gtk_call_function(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference PHP_GTK_API zend_class_entry* phpg_register_class(const char *class_name, zend_function_entry *class_functions, zend_class_entry *parent, zend_uint ce_flags, prop_info_t *prop_info, create_object_func_t create_obj_func, GType gtype TSRMLS_DC); PHP_GTK_API zend_class_entry* phpg_register_interface(const char *iface_name, zend_function_entry *iface_methods, GType gtype TSRMLS_DC); -PHP_GTK_API zend_class_entry* phpg_create_class(GType gtype); +PHP_GTK_API zend_class_entry* phpg_create_class(GType gtype TSRMLS_DC); PHP_GTK_API void phpg_init_object(void *pobj, zend_class_entry *ce TSRMLS_DC); PHP_GTK_API zend_bool phpg_parse_ctor_props(GType gtype, zval **php_args, GParameter *params, guint *n_params, char **prop_names TSRMLS_DC); @@ -370,13 +370,13 @@ static inline zend_bool phpg_object_isa(zval *zobj, zend_class_entry *ce TSRMLS_ return TRUE; } -static inline zend_class_entry* phpg_class_from_gtype(GType gtype) +static inline zend_class_entry* phpg_class_from_gtype(GType gtype TSRMLS_DC) { zend_class_entry *ce = NULL; ce = g_type_get_qdata(gtype, phpg_class_key); if (!ce) { - ce = phpg_create_class(gtype); + ce = phpg_create_class(gtype TSRMLS_CC); } assert(ce != NULL); @@ -435,22 +435,15 @@ static inline gchar* phpg_from_utf8(const gchar *str, zend_uint str_len, gsize * } #define PHPG_THROW_EXCEPTION(exception, message) \ - do { \ - TSRMLS_FETCH(); \ zend_throw_exception(exception, message, 0 TSRMLS_CC); \ - return; \ - } while (0) + return; #define PHPG_THROW_CONSTRUCT_EXCEPTION(type) \ PHPG_THROW_EXCEPTION(phpg_construct_exception, "could not construct " #type " object"); #define PHPG_THROW_EXCEPTION_WITH_RETURN(exception, message, retval) \ - do { \ - TSRMLS_FETCH(); \ zend_throw_exception(exception, message, 0 TSRMLS_CC); \ return retval; \ - } while (0) - #define MAKE_ZVAL_IF_NULL(z) \ do { \ @@ -458,7 +451,7 @@ static inline gchar* phpg_from_utf8(const gchar *str, zend_uint str_len, gsize * } while (0); -void phpg_register_exceptions(); +void phpg_register_exceptions(TSRMLS_D); gboolean phpg_handler_marshal(gpointer user_data); PHP_GTK_API zval* phpg_throw_gerror_exception(const char *domain, long code, const char *message TSRMLS_DC); @@ -474,7 +467,7 @@ PHP_GTK_API void phpg_register_string_constant(zend_class_entry *ce, char *name, void phpg_gtype_register_self(TSRMLS_D); PHP_GTK_API void phpg_gtype_new(zval *zobj, GType type TSRMLS_DC); -PHP_GTK_API GType phpg_gtype_from_zval(zval *value); +PHP_GTK_API GType phpg_gtype_from_zval(zval *value TSRMLS_DC); PHP_GTK_API GType phpg_gtype_from_class(zend_class_entry *ce TSRMLS_DC);