com php/gtk-src: Fixed more tsrmls stuff Compiles now in ZTS mode: ext/gtk+/gtk-2.10.overrides ext/gtk+/gtk-2.12.overrides ext/gtk+/gtk.overrides
ext/gtk+/gtktreeview.overrides ext/gtk+/php_gtk+_types.c ext/scintilla/scintilla.in generator/templates.php main/phpg_gobject.c

Commit: ba6ed42850464c6eae51a0d65fb29bf3b976b5ac Author: Elizabeth M Smith <auroraeosrose@gmail.com> Wed, 18 Jul 2012 12:58:11 -0400 Parents: 0c07e8033566f64000661c698ad6cde4fbf56210 Branches: master Link: http://git.php.net/?p=php/gtk-src.git;a=commitdiff;h=ba6ed42850464c6eae51a0d65fb29bf3b976b5ac Log: Fixed more tsrmls stuff Compiles now in ZTS mode Changed paths: M ext/gtk+/gtk-2.10.overrides M ext/gtk+/gtk-2.12.overrides M ext/gtk+/gtk.overrides M ext/gtk+/gtktreeview.overrides M ext/gtk+/php_gtk+_types.c M ext/scintilla/scintilla.in M generator/templates.php M main/phpg_gobject.c

diff --git a/ext/gtk+/gtk-2.10.overrides b/ext/gtk+/gtk-2.10.overrides index 66e3554..e9880d5 100644 --- a/ext/gtk+/gtk-2.10.overrides +++ b/ext/gtk+/gtk-2.10.overrides @@ -535,7 +535,7 @@ PHP_METHOD } } - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); if(!wrapped_obj) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkRecentChooserDialog); } if(buttons) { diff --git a/ext/gtk+/gtk-2.12.overrides b/ext/gtk+/gtk-2.12.overrides index a15682d..9a36561 100644 --- a/ext/gtk+/gtk-2.12.overrides +++ b/ext/gtk+/gtk-2.12.overrides @@ -588,7 +588,7 @@ PHP_METHOD return; } - obj = (GObject *)g_object_newv(phpg_gtype_from_zval(this_ptr),0,NULL); + obj = (GObject *)g_object_newv(phpg_gtype_from_zval(this_ptr TSRMLS_CC),0,NULL); if(!obj) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkScaleButton); } adj = (GtkAdjustment *)gtk_adjustment_new(min,min,max,step,step,0); gtk_scale_button_set_adjustment(GTK_SCALE_BUTTON(obj),GTK_ADJUSTMENT(adj)); diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides index 5f6ff88..c708cb6 100644 --- a/ext/gtk+/gtk.overrides +++ b/ext/gtk+/gtk.overrides @@ -1300,7 +1300,7 @@ PHP_METHOD "page_increment", page_incr, "page_size", page_size, NULL); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkAdjustment TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkAdjustment); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -1376,7 +1376,7 @@ PHP_METHOD zend_bool free_text = FALSE, use_underline = 1; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|ub", &text, &free_text, &use_underline)) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton); } if (text) { @@ -1389,7 +1389,7 @@ PHP_METHOD if (free_text) g_free(text); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -1411,7 +1411,7 @@ PHP_METHOD zend_bool free_stock_id; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "u", &stock_id, &free_stock_id)) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton); } wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_class(EG(scope) TSRMLS_CC), "label", stock_id, @@ -1420,7 +1420,7 @@ PHP_METHOD if (free_stock_id) g_free(stock_id); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkButton); } phpg_gobject_new(&return_value, wrapped_obj TSRMLS_CC); @@ -1520,7 +1520,7 @@ PHP_METHOD zend_bool free_text = FALSE, use_underline = 1; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|ub", &text, &free_text, &use_underline)) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkCheckButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkCheckButton); } if (text) { @@ -1533,7 +1533,7 @@ PHP_METHOD if (free_text) g_free(text); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkCheckButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkCheckButton); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -1558,7 +1558,7 @@ PHP_METHOD zend_bool free_text = FALSE, use_underline = 1; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|ub", &text, &free_text, &use_underline)) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkMenuItem TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkMenuItem); } wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); @@ -1578,7 +1578,7 @@ PHP_METHOD if (free_text) g_free(text); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkMenuItem TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkMenuItem); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); @@ -2180,10 +2180,10 @@ PHP_METHOD } if (php_model && Z_TYPE_P(php_model) != IS_NULL) { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), "model", + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "model", GTK_TREE_MODEL(PHPG_GOBJECT(php_model)), NULL); } else { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (!wrapped_obj) { @@ -2270,11 +2270,11 @@ PHP_METHOD } if (model && Z_TYPE_P(model) != IS_NULL) { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), "model", + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "model", GTK_TREE_MODEL(PHPG_GOBJECT(model)), "text-column", text_column, NULL); } else { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (!wrapped_obj) { @@ -2598,7 +2598,7 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkDialog); } - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); if (!wrapped_obj) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkDialog); @@ -2773,7 +2773,7 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkEntry); } - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "max-length", max, "text", text, NULL); if (free_text) g_free(text); @@ -3571,7 +3571,7 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkFileChooserDialog); } - wrapped_obj = (GObject *) g_object_new(phpg_gtype_from_zval(this_ptr), + wrapped_obj = (GObject *) g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "title", title, "action", action, "file-system-backend", backend, NULL); @@ -3830,10 +3830,10 @@ PHP_METHOD } if (php_model && Z_TYPE_P(php_model) != IS_NULL) { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), "model", + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "model", GTK_TREE_MODEL(PHPG_GOBJECT(php_model)), NULL); } else { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (!wrapped_obj) { @@ -4146,7 +4146,7 @@ PHP_METHOD GtkAccelGroup *accel_group = NULL; GObject *wrapped_obj; - if (phpg_gtype_from_zval(this_ptr) != GTK_TYPE_IMAGE_MENU_ITEM) { + if (phpg_gtype_from_zval(this_ptr TSRMLS_CC) != GTK_TYPE_IMAGE_MENU_ITEM) { PHPG_THROW_EXCEPTION(phpg_construct_exception, "Subclassing GtkImageMenuItem requires more than you know"); return; } @@ -4195,10 +4195,10 @@ PHP_METHOD } if (text) { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), "label", text, + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "label", text, "use-underline", use_underline, NULL); } else { - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); } if (free_text) g_free(text); @@ -4303,7 +4303,7 @@ PHP_METHOD(GtkListItem, __construct) wrapped_obj = (GObject *) gtk_list_item_new_with_label(label); if (free_label) g_free(label); } else { - wrapped_obj = (GObject *) g_object_newv(phpg_gtype_from_zval(this_ptr), 0, NULL); + wrapped_obj = (GObject *) g_object_newv(phpg_gtype_from_zval(this_ptr TSRMLS_CC), 0, NULL); } if (!wrapped_obj) { @@ -4503,7 +4503,7 @@ PHP_METHOD zend_bool free_message; GObject *wrapped_obj; - if (phpg_gtype_from_zval(this_ptr) != GTK_TYPE_MESSAGE_DIALOG) { + if (phpg_gtype_from_zval(this_ptr TSRMLS_CC) != GTK_TYPE_MESSAGE_DIALOG) { PHPG_THROW_EXCEPTION(phpg_construct_exception, "Subclassing GtkMessageDialog requires more than you know"); return; } @@ -4568,7 +4568,7 @@ PHP_METHOD PHPG_THROW_CONSTRUCT_EXCEPTION(GtkMenuItem); } - wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr), NULL); + wrapped_obj = (GObject *)g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), NULL); if (text) { GtkWidget *accel_label; accel_label = g_object_new(GTK_TYPE_ACCEL_LABEL, NULL); @@ -4678,7 +4678,7 @@ PHP_METHOD if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "i|O", &socket_id, &display)) PHPG_THROW_CONSTRUCT_EXCEPTION(GtkPlug); - 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) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkPlug); @@ -4751,9 +4751,9 @@ PHP_METHOD } if (adjustment) { - wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr), "adjustment", adjustment, NULL); + wrapped_obj = g_object_new(phpg_gtype_from_zval(this_ptr TSRMLS_CC), "adjustment", adjustment, NULL); } 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) { @@ -4829,7 +4829,7 @@ PHP_METHOD zend_bool free_label, use_underline = 1; GtkRadioButton *group = NULL; GObject *wrapped_obj; - GType gtype = phpg_gtype_from_zval(this_ptr); + GType gtype = phpg_gtype_from_zval(this_ptr TSRMLS_CC); if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|Nub", &php_group, gtkradiobutton_ce, &label, &free_label, &use_underline)) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkRadioButton); @@ -4937,7 +4937,7 @@ PHP_METHOD zend_bool free_label, use_underline = 1; GtkRadioMenuItem *group = NULL; GObject *wrapped_obj; - GType gtype = phpg_gtype_from_zval(this_ptr); + GType gtype = phpg_gtype_from_zval(this_ptr TSRMLS_CC); if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|Nub", &php_group, gtkradiomenuitem_ce, &label, &free_label, &use_underline)) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkRadioMenuItem); @@ -5080,7 +5080,7 @@ PHP_METHOD char *stock_id = NULL; zend_bool free_stock_id; GObject *wrapped_obj; - GType gtype = phpg_gtype_from_zval(this_ptr); + GType gtype = phpg_gtype_from_zval(this_ptr TSRMLS_CC); if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|Nu", &php_group, gtkradiotoolbutton_ce, &stock_id, &free_stock_id)) { PHPG_THROW_CONSTRUCT_EXCEPTION(GtkRadioToolButton); @@ -5464,7 +5464,7 @@ PHP_METHOD zend_bool free_text = FALSE, use_underline = 1; if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|ub", &text, &free_text, &use_underline)) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkToggleButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkToggleButton); } if (text) { @@ -5477,7 +5477,7 @@ PHP_METHOD if (free_text) g_free(text); if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkToggleButton TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkToggleButton); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); diff --git a/ext/gtk+/gtktreeview.overrides b/ext/gtk+/gtktreeview.overrides index ed17447..56474de 100644 --- a/ext/gtk+/gtktreeview.overrides +++ b/ext/gtk+/gtktreeview.overrides @@ -283,20 +283,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(GtkListStore); } } - 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_list_store_set_column_types(GTK_LIST_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) { @@ -332,7 +332,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 GtkListStore"); @@ -777,7 +777,7 @@ PHP_METHOD column_types[i] = phpg_gtype_from_zval(*args[i] TSRMLS_CC); if (column_types[i] == 0) { efree(column_types); - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeStore); } } @@ -1598,7 +1598,7 @@ PHP_METHOD } if (!wrapped_obj) { - PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter TSRMLS_CC); + PHPG_THROW_CONSTRUCT_EXCEPTION(GtkTreeModelFilter); } phpg_gobject_set_wrapper(this_ptr, wrapped_obj TSRMLS_CC); diff --git a/ext/gtk+/php_gtk+_types.c b/ext/gtk+/php_gtk+_types.c index b123931..8711947 100644 --- a/ext/gtk+/php_gtk+_types.c +++ b/ext/gtk+/php_gtk+_types.c @@ -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 TSRMLS_CC)); + value = php_gdk_window_new(event->crossing.subwindow TSRMLS_CC); add_property_zval(result, "subwindow", value); } else add_property_null(result, "subwindow"); @@ -2055,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 TSRMLS_CC)); + *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) TSRMLS_CC)); + *return_value = *php_gdk_window_new(gdk_window_get_toplevel(win) TSRMLS_CC); return; } else if (!strcmp(prop_name, "children")) { GList *children, *tmp; @@ -2066,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 TSRMLS_CC)); + 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); @@ -2933,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 TSRMLS_CC)); + *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 TSRMLS_CC)); + *return_value = *php_gdk_window_new(context->dest_window TSRMLS_CC); return; } else if (!strcmp(prop_name, "targets")) { GList *tmp; diff --git a/ext/scintilla/scintilla.in b/ext/scintilla/scintilla.in index 61bc2f8..21371a0 100644 --- a/ext/scintilla/scintilla.in +++ b/ext/scintilla/scintilla.in @@ -418,7 +418,7 @@ static PHP_METHOD(Scintilla, __construct) { GObject *wrapped_obj; - GType gtype = phpg_gtype_from_zval(this_ptr); + GType gtype = phpg_gtype_from_zval(this_ptr TSRMLS_CC); if(!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) { php_error(E_ERROR, "php-gtk-scintilla: Wrong args"); //PHPG_THROW_CONSTRUCT_EXCEPTION(Scintilla); diff --git a/generator/templates.php b/generator/templates.php index a098086..0bec10c 100644 --- a/generator/templates.php +++ b/generator/templates.php @@ -153,9 +153,9 @@ static PHP_METHOD(%(class), %(name)) GParameter params[%(n_params)]; zval *php_args[%(n_args)] = { NULL, }; char *prop_names[] = { %(props) NULL }; - GType gtype = phpg_gtype_from_zval(this_ptr); GObject *wrapped_obj; guint i, n_params; + GType gtype = phpg_gtype_from_zval(this_ptr TSRMLS_CC); if (!php_gtk_parse_args(ZEND_NUM_ARGS(), \"%(specs)\"%(parse_list))) { PHPG_THROW_CONSTRUCT_EXCEPTION(%(class)); diff --git a/main/phpg_gobject.c b/main/phpg_gobject.c index 3e11b63..3ed2be1 100644 --- a/main/phpg_gobject.c +++ b/main/phpg_gobject.c @@ -261,11 +261,11 @@ zend_bool phpg_gobject_construct(zval *this_ptr, GType object_type, zval *props if (G_TYPE_IS_ABSTRACT(object_type)) { snprintf(buf, 128, "Cannot instantiate abstract class %s", g_type_name(object_type)); - PHPG_THROW_EXCEPTION_WITH_RETURN(phpg_construct_exception, buf, 0 TSRMLS_CC); + PHPG_THROW_EXCEPTION_WITH_RETURN(phpg_construct_exception, buf, 0); } if ((klass = g_type_class_ref(object_type)) == NULL) { - PHPG_THROW_EXCEPTION_WITH_RETURN(phpg_construct_exception, "Could not get a reference to type class", 0 TSRMLS_CC); + PHPG_THROW_EXCEPTION_WITH_RETURN(phpg_construct_exception, "Could not get a reference to type class", 0); } if (props) {