rrichards Sun Nov 27 07:19:05 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/com_dotnet com_misc.c com_saproxy.c com_handlers.c
php_com_dotnet_internal.h
Log:
Fixed bug #35316 (Application exception trying to create COM object)
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_misc.c?r1=1.8&r2=1.8.2.1&ty=u
Index: php-src/ext/com_dotnet/com_misc.c
diff -u php-src/ext/com_dotnet/com_misc.c:1.8
php-src/ext/com_dotnet/com_misc.c:1.8.2.1
--- php-src/ext/com_dotnet/com_misc.c:1.8 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_misc.c Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_misc.c,v 1.8 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_misc.c,v 1.8.2.1 2005/11/27 12:19:04 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -51,6 +51,7 @@
memset(obj, 0, sizeof(*obj));
obj->code_page = codepage;
obj->ce = php_com_variant_class_entry;
+ obj->zo.ce = php_com_variant_class_entry;
VariantInit(&obj->v);
V_VT(&obj->v) = VT_DISPATCH;
@@ -73,6 +74,7 @@
memset(obj, 0, sizeof(*obj));
obj->code_page = codepage;
obj->ce = php_com_variant_class_entry;
+ obj->zo.ce = php_com_variant_class_entry;
VariantInit(&obj->v);
VariantCopyInd(&obj->v, v);
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_saproxy.c?r1=1.15&r2=1.15.2.1&ty=u
Index: php-src/ext/com_dotnet/com_saproxy.c
diff -u php-src/ext/com_dotnet/com_saproxy.c:1.15
php-src/ext/com_dotnet/com_saproxy.c:1.15.2.1
--- php-src/ext/com_dotnet/com_saproxy.c:1.15 Wed Aug 3 10:06:42 2005
+++ php-src/ext/com_dotnet/com_saproxy.c Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_saproxy.c,v 1.15 2005/08/03 14:06:42 sniper Exp $ */
+/* $Id: com_saproxy.c,v 1.15.2.1 2005/11/27 12:19:04 rrichards Exp $ */
/* This module implements a SafeArray proxy which is used internally
* by the engine when resolving multi-dimensional array accesses on
@@ -323,7 +323,7 @@
return NULL;
}
-static union _zend_function *saproxy_method_get(zval *object, char *name, int
len TSRMLS_DC)
+static union _zend_function *saproxy_method_get(zval **object, char *name, int
len TSRMLS_DC)
{
/* no methods */
return NULL;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/com_handlers.c?r1=1.30&r2=1.30.2.1&ty=u
Index: php-src/ext/com_dotnet/com_handlers.c
diff -u php-src/ext/com_dotnet/com_handlers.c:1.30
php-src/ext/com_dotnet/com_handlers.c:1.30.2.1
--- php-src/ext/com_dotnet/com_handlers.c:1.30 Wed Aug 3 10:06:41 2005
+++ php-src/ext/com_dotnet/com_handlers.c Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: com_handlers.c,v 1.30 2005/08/03 14:06:41 sniper Exp $ */
+/* $Id: com_handlers.c,v 1.30.2.1 2005/11/27 12:19:04 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -677,6 +677,7 @@
VariantInit(&obj->v);
obj->code_page = CP_ACP;
obj->ce = ce;
+ obj->zo.ce = ce;
retval.handle = zend_objects_store_put(obj, NULL,
php_com_object_free_storage, php_com_object_clone TSRMLS_CC);
retval.handlers = &php_com_object_handlers;
http://cvs.php.net/diff.php/php-src/ext/com_dotnet/php_com_dotnet_internal.h?r1=1.14&r2=1.14.2.1&ty=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
php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14.2.1
--- php-src/ext/com_dotnet/php_com_dotnet_internal.h:1.14 Wed Aug 3
10:06:43 2005
+++ php-src/ext/com_dotnet/php_com_dotnet_internal.h Sun Nov 27 07:19:04 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_com_dotnet_internal.h,v 1.14 2005/08/03 14:06:43 sniper Exp $ */
+/* $Id: php_com_dotnet_internal.h,v 1.14.2.1 2005/11/27 12:19:04 rrichards Exp
$ */
#ifndef PHP_COM_DOTNET_INTERNAL_H
#define PHP_COM_DOTNET_INTERNAL_H
@@ -33,6 +33,8 @@
#undef php_win_err
typedef struct _php_com_dotnet_object {
+ zend_object zo;
+
VARIANT v;
ITypeInfo *typeinfo;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
