Imported Upstream version 5.2.2upstream/5.2.2

3 files changed, 85 insertions, 0 deletions

diff --git a/ext/com_dotnet/tests/bug33386.phpt b/ext/com_dotnet/tests/bug33386.phpt
new file mode 100644
index 000000000..e57f1274c
--- /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
index 000000000..dc8d1ef06
--- /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
diff --git a/ext/com_dotnet/tests/bug39606.phpt b/ext/com_dotnet/tests/bug39606.phpt
new file mode 100644
index 000000000..07ebef3bd
--- /dev/null
+++ b/ext/com_dotnet/tests/bug39606.phpt
@@ -0,0 +1,22 @@
+--TEST--
+COM: Loading typelib corrupts memory
+--SKIPIF--
+<?php # vim:ft=php
+if (!extension_loaded("com_dotnet")) print "skip COM/.Net support not present"; ?>
+--FILE--
+<?php // $Id: bug39606.phpt,v 1.1.2.1 2006/12/09 10:52:09 rrichards Exp $
+error_reporting(E_ALL);
+
+$arEnv = array_change_key_case($_SERVER, CASE_UPPER);
+
+$root = dirname($arEnv['COMSPEC']);
+$typelib = $root.'\activeds.tlb';
+
+var_dump(com_load_typelib($typelib));
+var_dump(com_load_typelib($typelib));
+?>
+===DONE===
+--EXPECT--
+bool(true)
+bool(true)
+===DONE===
\ No newline at end of file