MFB:

- 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

diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c
index f83b5ee9f70c99c66a48ec9687ec6b154117afca..c50250080a7206dfb50ed09d3ce972cfee5641e9 100644 (file)
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@@ -76,7 +76,7 @@ static void com_property_write(zval *object, zval *member, zval *value TSRMLS_DC
 
                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 {

diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 785ad06c5410e8ef937d7952cf25797efe09befd..3efbba157666c6bd86526a64107e0be3ba94bd68 100644 (file)
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -296,19 +296,36 @@ PHP_FUNCTION(com_variant_create_instance)
                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))) {
+
+               /* 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;
+                       }
+               }
 
-               res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
+               if (vt) {
+                       res = VariantChangeType(&obj->v, &obj->v, 0, (VARTYPE)vt);
 
-               if (FAILED(res)) {
-                       char *werr, *msg;
+                       if (FAILED(res)) {
+                               char *werr, *msg;
 
-                       werr = php_win_err(res);
-                       spprintf(&msg, 0, "Variant type conversion failed: %s", werr);
-                       LocalFree(werr);
+                               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);
+                               php_com_throw_exception(res, msg TSRMLS_CC);
+                               efree(msg);
+                       }
                }
        }
 

diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c
index 576fa26bb9fcd76886e6f806e9fff47bf561d6e3..0a7b275f55ff6505f0c2d4690cb479e13a6282ce 100644 (file)
--- a/ext/com_dotnet/com_wrapper.c
+++ b/ext/com_dotnet/com_wrapper.c
@@ -477,6 +477,7 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC)
                        /* 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 @@ static void generate_dispids(php_dispatchex *disp TSRMLS_DC)
                        /* 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);

diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt
new file mode 100644 (file)
index 0000000..e57f127
--- /dev/null
+++ b/ext/com_dotnet/tests/bug33386.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #33386 (ScriptControl only sees last function of class)
+--SKIPIF--
+<?php 
+if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--FILE--
+<?php 
+error_reporting(E_ALL);
+
+class twoFuncs {
+    public function func1() { echo " func one\n"; }
+    public function func2() { echo " func two\n"; }
+}
+
+try {
+       $ciTF = new twoFuncs;
+
+       $oScript = new COM("MSScriptControl.ScriptControl");
+       $oScript->Language = "VBScript";
+
+       $oScript->AddObject ("tfA", $ciTF, true);
+       foreach (array(1,2) as $i) {
+               $oScript->ExecuteStatement ("tfA.func$i");
+               $oScript->ExecuteStatement ("func$i");
+       }
+       $oScript->AddObject ("tfB", $ciTF);
+       foreach (array(1,2) as $i) {
+               $oScript->ExecuteStatement ("tfB.func$i");
+       }
+} catch (Exception $e) {
+       print $e;
+}
+?>
+--EXPECT--
+ func one
+ func one
+ func two
+ func two
+ func one
+ func two

diff --git a/ext/com_dotnet/tests/bug39596.phpt b/ext/com_dotnet/tests/bug39596.phpt
new file mode 100644 (file)
index 0000000..dc8d1ef
--- /dev/null
+++ b/ext/com_dotnet/tests/bug39596.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Bug #39596 (Creating Variant of type VT_ARRAY)
+--SKIPIF--
+<?php 
+if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--FILE--
+<?php 
+error_reporting(E_ALL);
+
+try {
+       $binding_string = array('aaa','bbb','ccc');
+       $v = new VARIANT( $binding_string, VT_ARRAY );
+       foreach ($v AS $element) {
+               print $element."\n";
+       }
+} catch (Exception $e) {
+       print $e;
+}
+?>
+--EXPECT--
+aaa
+bbb
+ccc