cvs: php-src(PHP_5_2) /ext/com_dotnet com_extension.c com_handlers.c com_iterator.c com_saproxy.c php_com_dotnet_internal.h
| From: | Rob Richards | Date: | Wed, 10 May 2006 14:39:11 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/com_dotnet com_extension.c com_handlers.c com_iterator.c com_saproxy.c php_com_dotnet_internal.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38131@lists.php.net to get a copy of this message | ||
rrichards Wed May 10 14:39:11 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/com_dotnet com_extension.c com_handlers.c
com_iterator.c com_saproxy.c
php_com_dotnet_internal.h
Log:
- Update after api changes
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_extension.c?r1=1.17.2.2&r2=1.17.2.2.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_extension.c
diff -u php-src/ext/com_dotnet/com_extension.c:1.17.2.2
php-src/ext/com_dotnet/com_extension.c:1.17.2.2.2.1
--- php-src/ext/com_dotnet/com_extension.c:1.17.2.2 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_extension.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_extension.c,v 1.17.2.2 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_extension.c,v 1.17.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -192,7 +192,7 @@
php_com_persist_minit(INIT_FUNC_ARGS_PASSTHRU);
INIT_CLASS_ENTRY(ce, "com_exception", NULL);
- php_com_exception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(), NULL TSRMLS_CC);
+ php_com_exception_class_entry = zend_register_internal_class_ex(&ce,
zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
php_com_exception_class_entry->ce_flags |= ZEND_ACC_FINAL;
/* php_com_exception_class_entry->constructor->common.fn_flags |= ZEND_ACC_PROTECTED; */
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.5&r2=1.30.2.5.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.30.2.5
php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.1
--- php-src/ext/com_dotnet/com_handlers.c:1.30.2.5 Tue Feb 7 11:50:54 2006
+++ php-src/ext/com_dotnet/com_handlers.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.30.2.5 2006/02/07 11:50:54 rrichards Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.5.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -486,17 +486,12 @@
return ret;
}
-static int com_object_cast(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_DC)
+static int com_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
php_com_dotnet_object *obj;
VARIANT v;
VARTYPE vt = VT_EMPTY;
- zval free_obj;
HRESULT res = S_OK;
-
- if (should_free) {
- free_obj = *writeobj;
- }
obj = CDNO_FETCH(readobj);
ZVAL_NULL(writeobj);
@@ -538,10 +533,6 @@
VariantClear(&v);
- if (should_free) {
- zval_dtor(&free_obj);
- }
-
if (SUCCEEDED(res)) {
return SUCCESS;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_iterator.c?r1=1.9.2.2&r2=1.9.2.2.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_iterator.c
diff -u php-src/ext/com_dotnet/com_iterator.c:1.9.2.2
php-src/ext/com_dotnet/com_iterator.c:1.9.2.2.2.1
--- php-src/ext/com_dotnet/com_iterator.c:1.9.2.2 Tue Feb 7 11:50:54 2006
+++ php-src/ext/com_dotnet/com_iterator.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_iterator.c,v 1.9.2.2 2006/02/07 11:50:54 rrichards Exp $ */
+/* $Id: com_iterator.c,v 1.9.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -139,7 +139,7 @@
NULL
};
-zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC)
+zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC)
{
php_com_dotnet_object *obj;
struct php_com_iterator *I;
@@ -149,6 +149,10 @@
unsigned long n_fetched;
zval *ptr;
+ if (by_ref) {
+ zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
+ }
+
obj = CDNO_FETCH(object);
if (V_VT(&obj->v) != VT_DISPATCH && !V_ISARRAY(&obj->v)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15.2.2&r2=1.15.2.2.2.1&diff_format=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2
php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2.2.1
--- php-src/ext/com_dotnet/com_saproxy.c:1.15.2.2 Sun Jan 1 12:50:00 2006
+++ php-src/ext/com_dotnet/com_saproxy.c Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.15.2.2 2006/01/01 12:50:00 sniper Exp $ */
+/* $Id: com_saproxy.c,v 1.15.2.2.2.1 2006/05/10 14:39:10 rrichards Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -357,7 +357,7 @@
return -1;
}
-static int saproxy_object_cast(zval *readobj, zval *writeobj, int type, int should_free TSRMLS_DC)
+static int saproxy_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
{
return FAILURE;
}
@@ -554,12 +554,16 @@
};
-zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC)
+zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref
TSRMLS_DC)
{
php_com_saproxy *proxy = SA_FETCH(object);
php_com_saproxy_iter *I;
int i;
+ if (by_ref) {
+ zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
+ }
+
I = ecalloc(1, sizeof(*I));
I->iter.funcs = &saproxy_iter_funcs;
I->iter.data = I;
http://cvs.php.net/viewcvs.cgi/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.14.2.3&r2=1.14.2.3.2.1&diff_format=u
Index: php-src/ext/com_dotnet/php_com_dotnet_internal.h
diff -u php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14.2.3
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14.2.3.2.1
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14.2.3 Thu Jan 26 11:17:34 2006
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Wed May 10 14:39:10 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.14.2.3 2006/01/26 11:17:34 rrichards Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.14.2.3.2.1 2006/05/10 14:39:10 rrichards Exp $ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -82,7 +82,7 @@
void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable TSRMLS_DC);
/* com_saproxy.c */
-zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC);
+zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref
TSRMLS_DC);
int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS_DC);
/* com_olechar.c */
@@ -177,7 +177,7 @@
int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid,
int codepage TSRMLS_DC);
/* com_iterator.c */
-zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object TSRMLS_DC);
+zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
#endif