cvs: php-src(PHP_5_2) /ext/com_dotnet com_handlers.c com_variant.c com_wrapper.c /ext/com_dotnet/tests bug33386.phpt bug39596.phpt

rrichards Sun Dec 24 10:00:59 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/com_dotnet/tests bug33386.phpt bug39596.phpt Modified files: /php-src/ext/com_dotnet com_handlers.c com_variant.c com_wrapper.c Log: - fix bug #33386 (ScriptControl only sees last function of class): com_wrapper.c - fix bug #37588 (COM Property propputref converts to PHP function and can't be accesed): com_handlers.c - fix bug #39596 (Creating Variant of type VT_ARRAY): com_variant.c - add tests http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_handlers.c?r1=1.30.2.5.2.3&r2=1.30.2.5.2.4&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.2.3 php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.4 --- php-src/ext/com_dotnet/com_handlers.c:1.30.2.5.2.3 Fri Nov 17 11:40:52 2006 +++ php-src/ext/com_dotnet/com_handlers.c Sun Dec 24 10:00:58 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_handlers.c,v 1.30.2.5.2.3 2006/11/17 11:40:52 dmitry Exp $ */ +/* $Id: com_handlers.c,v 1.30.2.5.2.4 2006/12/24 10:00:58 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -76,7 +76,7 @@ convert_to_string_ex(&member); if (SUCCESS == php_com_do_invoke(obj, Z_STRVAL_P(member), Z_STRLEN_P(member), - DISPATCH_PROPERTYPUT, &v, 1, &value TSRMLS_CC)) { + DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &v, 1, &value TSRMLS_CC)) { VariantClear(&v); } } else { http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_variant.c?r1=1.11.2.2.2.2&r2=1.11.2.2.2.3&diff_format=u Index: php-src/ext/com_dotnet/com_variant.c diff -u php-src/ext/com_dotnet/com_variant.c:1.11.2.2.2.2 php-src/ext/com_dotnet/com_variant.c:1.11.2.2.2.3 --- php-src/ext/com_dotnet/com_variant.c:1.11.2.2.2.2 Fri Nov 17 11:40:52 2006 +++ php-src/ext/com_dotnet/com_variant.c Sun Dec 24 10:00:59 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_variant.c,v 1.11.2.2.2.2 2006/11/17 11:40:52 dmitry Exp $ */ +/* $Id: com_variant.c,v 1.11.2.2.2.3 2006/12/24 10:00:59 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -289,19 +289,36 @@ php_com_variant_from_zval(&obj->v, zvalue, obj->code_page TSRMLS_CC); } - if (ZEND_NUM_ARGS() >= 2) { + /* Only perform conversion if variant not already of type passed */ + if ((ZEND_NUM_ARGS() >= 2) && (vt != V_VT(&obj->v))) { - res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt); + /* If already an array and VT_ARRAY is passed then: + - if only VT_ARRAY passed then do not perform a conversion + - if VT_ARRAY plus other type passed then perform conversion + but will probably fail (origional behavior) + */ + if ((vt & VT_ARRAY) && (V_VT(&obj->v) & VT_ARRAY)) { + long orig_vt = vt; + + vt &= ~VT_ARRAY; + if (vt) { + vt = orig_vt; + } + } - if (FAILED(res)) { - char *werr, *msg; + if (vt) { + res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt); - werr = php_win_err(res); - spprintf(&msg, 0, "Variant type conversion failed: %s", werr); - LocalFree(werr); + if (FAILED(res)) { + char *werr, *msg; - php_com_throw_exception(res, msg TSRMLS_CC); - efree(msg); + werr = php_win_err(res); + spprintf(&msg, 0, "Variant type conversion failed: %s", werr); + LocalFree(werr); + + php_com_throw_exception(res, msg TSRMLS_CC); + efree(msg); + } } } http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/com_wrapper.c?r1=1.9.2.1&r2=1.9.2.1.2.1&diff_format=u Index: php-src/ext/com_dotnet/com_wrapper.c diff -u php-src/ext/com_dotnet/com_wrapper.c:1.9.2.1 php-src/ext/com_dotnet/com_wrapper.c:1.9.2.1.2.1 --- php-src/ext/com_dotnet/com_wrapper.c:1.9.2.1 Sun Jan 1 12:50:00 2006 +++ php-src/ext/com_dotnet/com_wrapper.c Sun Dec 24 10:00:59 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_wrapper.c,v 1.9.2.1 2006/01/01 12:50:00 sniper Exp $ */ +/* $Id: com_wrapper.c,v 1.9.2.1.2.1 2006/12/24 10:00:59 rrichards Exp $ */ /* This module exports a PHP object as a COM object by wrapping it * using IDispatchEx */ @@ -477,6 +477,7 @@ /* add the mappings */ MAKE_STD_ZVAL(tmp); ZVAL_STRINGL(tmp, name, namelen-1, 1); + pid = zend_hash_next_free_element(disp->dispid_to_name); zend_hash_index_update(disp->dispid_to_name, pid, (void*)&tmp, sizeof(zval *), NULL); MAKE_STD_ZVAL(tmp); @@ -508,6 +509,7 @@ /* add the mappings */ MAKE_STD_ZVAL(tmp); ZVAL_STRINGL(tmp, name, namelen-1, 1); + pid = zend_hash_next_free_element(disp->dispid_to_name); zend_hash_index_update(disp->dispid_to_name, pid, (void*)&tmp, sizeof(zval *), NULL); MAKE_STD_ZVAL(tmp); http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/bug33386.phpt?view=markup&rev=1.1 Index: php-src/ext/com_dotnet/tests/bug33386.phpt +++ php-src/ext/com_dotnet/tests/bug33386.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/com_dotnet/tests/bug39596.phpt?view=markup&rev=1.1 Index: php-src/ext/com_dotnet/tests/bug39596.phpt +++ php-src/ext/com_dotnet/tests/bug39596.phpt