[PATCH] A few more win32 bits and pieces

main_ext.txt prevents Zend from trying to load extensions we don't have in place (yet). We could probably get away with libglade, but there's not much point at present. main_except.txt uses something that's actually available via the Zend API ;) gtk_zts.txt is just ZTS fixes (not too many here). I still get heaps of warnings - not a huge problem, doesn't break anything, just prevents a pure build - from the declaration of STYLE_NUM_STATS as uint on line 166 of php_gtk+_types.c. Making it 'int' clears those warnings - could it break anything else to make that change? I'm likely to complete work on the basic win32 build system tomorrow... that's not including the generator, but does include a bunch of new files. Will do a fresh checkout following these commits and make sure I didn't miss anything ZTS-related before I finish up. - Steph (gone for beer)

Index: main/php_gtk_ext.w32.c =================================================================== RCS file: /repository/php-gtk/main/php_gtk_ext.w32.c,v retrieving revision 1.4 diff -u -r1.4 php_gtk_ext.w32.c --- main/php_gtk_ext.w32.c 11 Apr 2002 02:19:50 -0000 1.4 +++ main/php_gtk_ext.w32.c 1 Sep 2005 20:19:55 -0000 @@ -25,14 +25,9 @@ #if HAVE_PHP_GTK #include "ext/gtk+/php_gtk+.h" -#include "ext/sqpane/php_sqpane.h" -#include "ext/libglade/php_libglade.h" - php_gtk_ext_entry *php_gtk_extensions[] = { - php_gtk_ext_libglade_ptr, php_gtk_ext_gtk__ptr, - php_gtk_ext_sqpane_ptr, }; #define EXTCOUNT (sizeof(php_gtk_extensions)/sizeof(php_gtk_ext_entry *)) Index: main/phpg_exceptions.c =================================================================== RCS file: /repository/php-gtk/main/phpg_exceptions.c,v retrieving revision 1.4 diff -u -r1.4 phpg_exceptions.c --- main/phpg_exceptions.c 9 May 2005 17:19:05 -0000 1.4 +++ main/phpg_exceptions.c 1 Sep 2005 20:23:15 -0000 @@ -69,7 +69,7 @@ zend_update_property_string(phpg_gerror_exception, exc, "message", sizeof("message")-1, (char *)message TSRMLS_CC); } - zend_throw_exception_internal(exc TSRMLS_CC); + zend_throw_exception_object(exc TSRMLS_CC); return exc; } ? ext/gtk+/config.w32 Index: ext/gtk+/php_gtk+_types.c =================================================================== RCS file: /repository/php-gtk/ext/gtk+/php_gtk+_types.c,v retrieving revision 1.34 diff -u -r1.34 php_gtk+_types.c --- ext/gtk+/php_gtk+_types.c 21 Aug 2005 01:30:58 -0000 1.34 +++ ext/gtk+/php_gtk+_types.c 1 Sep 2005 19:25:43 -0000 @@ -138,7 +138,7 @@ { GtkTreePath *path = NULL; - if (phpg_tree_path_from_zval(value, &path) == FAILURE) { + if (phpg_tree_path_from_zval(value, &path TSRMLS_CC) == FAILURE) { return FAILURE; } @@ -248,7 +248,7 @@ case STYLE_GC_ARRAY: { GdkGC **array = (GdkGC **) sh->array; - if (!phpg_object_check(value, gdkgc_ce)) { + if (!phpg_object_check(value, gdkgc_ce TSRMLS_CC)) { php_error(E_WARNING, "Can only assign a GdkGC object"); return; } @@ -262,7 +262,7 @@ case STYLE_PIXMAP_ARRAY: { GdkPixmap **array = (GdkPixmap **) sh->array; - if (Z_TYPE_P(value) != IS_NULL && !phpg_object_check(value, gdkgc_ce)) { + if (Z_TYPE_P(value) != IS_NULL && !phpg_object_check(value, gdkgc_ce TSRMLS_CC)) { php_error(E_WARNING, "Can only assign a GdkPixmap object or null"); return; } @@ -390,6 +390,7 @@ GtkTreeModel *child; GtkTreeIter child_iter; zval **item; + TSRMLS_FETCH(); assert(items != NULL);