X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Ftests%2Fcominterop.cs;h=4a5bd8fbc6fddfd4f0ac16635bca10ae077060ee;hb=99f2c2a103eaa87997ff4971a6b54d7cbf491575;hp=1614a172aec8928a4411c2d6957bfc54fef247d6;hpb=5942115cf2ec5bb3ad61bcb08070444156049fc1;p=mono.git

diff --git a/mono/tests/cominterop.cs b/mono/tests/cominterop.cs
index 1614a172aec..4a5bd8fbc6f 100644
--- a/mono/tests/cominterop.cs
+++ b/mono/tests/cominterop.cs
@@ -8,6 +8,7 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
+
 public class Tests
 {
 
@@ -65,42 +66,81 @@ public class Tests
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_sbyte([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_sbyte_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_byte([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_byte_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_short([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_short_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_ushort([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_ushort_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_int([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_int_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_uint([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_uint_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_long([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_long_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_ulong([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_ulong_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_float([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_float_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_double([MarshalAs(UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_double_byref([MarshalAs(UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_bstr ([MarshalAs (UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_bstr_byref ([MarshalAs (UnmanagedType.Struct)]out object obj);
+
 	[DllImport("libtest")]
 	public static extern int mono_test_marshal_variant_out_bool_true ([MarshalAs (UnmanagedType.Struct)]out object obj);
 
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_variant_out_bool_true_byref ([MarshalAs (UnmanagedType.Struct)]out object obj);
+
 	[DllImport ("libtest")]
 	public static extern int mono_test_marshal_variant_out_bool_false ([MarshalAs (UnmanagedType.Struct)]out object obj);
 
+	[DllImport ("libtest")]
+	public static extern int mono_test_marshal_variant_out_bool_false_byref ([MarshalAs (UnmanagedType.Struct)]out object obj);
+
 
 	public delegate int VarFunc (VarEnum vt, [MarshalAs (UnmanagedType.Struct)] object obj);
 
@@ -211,34 +251,83 @@ public class Tests
 	[DllImport ("libtest")]
 	public static extern int mono_test_marshal_ccw_itest ([MarshalAs (UnmanagedType.Interface)]ITestPresSig itest);
 
+	[DllImport ("libtest")]
+	public static extern int mono_test_marshal_array_ccw_itest (int count, [MarshalAs (UnmanagedType.LPArray, SizeParamIndex=0)] ITest[] ppUnk);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_out_1dim_vt_bstr_empty ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_out_1dim_vt_bstr ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_out_2dim_vt_i4 ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_out_4dim_vt_i4 ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byval_1dim_empty ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byval_1dim_vt_i4 ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byval_1dim_vt_mixed ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byval_2dim_vt_i4 ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byval_3dim_vt_bstr ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_byref_3dim_vt_bstr ([In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] ref Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_out_byref_1dim_empty ([In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] ref Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_out_byref_3dim_vt_bstr ([In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] ref Array array);
+
+	[DllImport("libtest")]
+	public static extern int mono_test_marshal_safearray_in_out_byref_1dim_vt_i4 ([In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] ref Array array);
+
 	[DllImport("libtest")]
-	public static extern int mono_test_marshal_variant_out_safearray_1dim_vt_bstr_empty([MarshalAs(UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+	public static extern int mono_test_marshal_safearray_in_out_byval_1dim_vt_i4 ([In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
 
 	[DllImport("libtest")]
-	public static extern int mono_test_marshal_variant_out_safearray_1dim_vt_bstr ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+	public static extern int mono_test_marshal_safearray_in_out_byval_3dim_vt_bstr ([In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array);
 
 	[DllImport("libtest")]
-	public static extern int mono_test_marshal_variant_out_safearray_2dim_vt_int ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+	public static extern int mono_test_marshal_safearray_mixed (
+		[In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array1,
+		[MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] out Array array2,
+		[In, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] Array array3,
+		[In, Out, MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)] ref Array array4);
 
 	[DllImport("libtest")]
-	public static extern int mono_test_marshal_variant_out_safearray_4dim_vt_int ([MarshalAs (UnmanagedType.SafeArray, SafeArraySubType = VarEnum.VT_VARIANT)]out Array array);
+	public static extern bool mono_cominterop_is_supported ();
 
-	public static int Main() {
+	public static int Main ()
+	{
+
+		bool isWindows = !(((int)Environment.OSVersion.Platform == 4) ||
+			((int)Environment.OSVersion.Platform == 128));
 
-        bool isWindows = !(((int)Environment.OSVersion.Platform == 4) || 
-            ((int)Environment.OSVersion.Platform == 128));
-		if (isWindows) {
+		if (mono_cominterop_is_supported () || isWindows)
+		{
 			#region BSTR Tests
 
 			string str;
 			if (mono_test_marshal_bstr_in ("mono_test_marshal_bstr_in") != 0)
 				return 1;
 			if (mono_test_marshal_bstr_out (out str) != 0 || str != "mono_test_marshal_bstr_out")
-                return 2;
-            if (mono_test_marshal_bstr_in_null (null) != 0)
-                return 1;
-            if (mono_test_marshal_bstr_out_null (out str) != 0 || str != null)
-                return 2;
+				return 2;
+			if (mono_test_marshal_bstr_in_null (null) != 0)
+				return 1;
+			if (mono_test_marshal_bstr_out_null (out str) != 0 || str != null)
+				return 2;
 
 			#endregion // BSTR Tests
 
@@ -342,10 +431,35 @@ public class Tests
 			if (mono_test_marshal_variant_out_bool_true_unmanaged (reffunc) != 0)
 				return 61;
 
+			if (mono_test_marshal_variant_out_sbyte_byref (out obj) != 0 || (sbyte)obj != 100)
+				return 97;
+			if (mono_test_marshal_variant_out_byte_byref (out obj) != 0 || (byte)obj != 100)
+				return 98;
+			if (mono_test_marshal_variant_out_short_byref (out obj) != 0 || (short)obj != 314)
+				return 99;
+			if (mono_test_marshal_variant_out_ushort_byref (out obj) != 0 || (ushort)obj != 314)
+				return 100;
+			if (mono_test_marshal_variant_out_int_byref (out obj) != 0 || (int)obj != 314)
+				return 101;
+			if (mono_test_marshal_variant_out_uint_byref (out obj) != 0 || (uint)obj != 314)
+				return 102;
+			if (mono_test_marshal_variant_out_long_byref (out obj) != 0 || (long)obj != 314)
+				return 103;
+			if (mono_test_marshal_variant_out_ulong_byref (out obj) != 0 || (ulong)obj != 314)
+				return 104;
+			if (mono_test_marshal_variant_out_float_byref (out obj) != 0 || ((float)obj - 3.14) / 3.14 > .001)
+				return 105;
+			if (mono_test_marshal_variant_out_double_byref (out obj) != 0 || ((double)obj - 3.14) / 3.14 > .001)
+				return 106;
+			if (mono_test_marshal_variant_out_bstr_byref (out obj) != 0 || (string)obj != "PI")
+				return 107;
+
 			#endregion // VARIANT Tests
 
 			#region Runtime Callable Wrapper Tests
 
+#if !MOBILE
+
 			IntPtr pUnk;
 			if (mono_test_marshal_com_object_create (out pUnk) != 0)
 				return 145;
@@ -419,6 +533,25 @@ public class Tests
 			if (TestITestPresSig (itest as ITestPresSig) != 0)
 				return 173;
 
+			if (TestITestDelegate (itest) != 0)
+				return 174;
+
+			if (TestIfaceNoIcall (itest as ITestPresSig) != 0)
+				return 201;
+
+			itest = new TestClass ();
+
+			if (TestITest (itest) != 0)
+				return 175;
+
+			itest = (ITest)System.Activator.CreateInstance (typeof(TestActivatorClass));
+
+			if (TestITest (itest) != 0)
+				return 176;
+
+
+#endif
+
 			#endregion // Runtime Callable Wrapper Tests
 
 			#region COM Callable Wrapper Tests
@@ -434,55 +567,183 @@ public class Tests
 
 			mono_test_marshal_ccw_itest (test_pres_sig);
 
+			// test for Xamarin-47560
+			var tests = new[] { test.Test };
+			if (mono_test_marshal_array_ccw_itest (1, tests) != 0)
+				return 201;
+
 			#endregion // COM Callable Wrapper Tests
 
 			#region SAFEARRAY tests
+			
+			if (isWindows) {
 
-			Array array;
-			if ((mono_test_marshal_variant_out_safearray_1dim_vt_bstr_empty(out array) != 0) || (array.Rank != 1) || (array.Length != 0))
-				return 62;
+				/* out */
 
-			if ((mono_test_marshal_variant_out_safearray_1dim_vt_bstr (out array) != 0) || (array.Rank != 1) || (array.Length != 10))
-				return 63;
-			for (int i = 0; i < 10; ++i) {
-				if (i != Convert.ToInt32(array.GetValue (i)))
-					return 64;
-			}
+				Array array;
+				if ((mono_test_marshal_safearray_out_1dim_vt_bstr_empty (out array) != 0) || (array.Rank != 1) || (array.Length != 0))
+					return 62;
 
-			if ((mono_test_marshal_variant_out_safearray_2dim_vt_int (out array) != 0) || (array.Rank != 2))
-				return 65;
-			if (   (array.GetLowerBound (0) != 0) || (array.GetUpperBound (0) != 3)
-				|| (array.GetLowerBound (1) != 0) || (array.GetUpperBound (1) != 2))
-				return 66;
-			for (int i = array.GetLowerBound (0); i <= array.GetUpperBound (0); ++i)
-			{
-				for (int j = array.GetLowerBound (1); j <= array.GetUpperBound (1); ++j) {
-					if ((i + 1) * 10 + (j + 1) != (int)array.GetValue (new long[] { i, j }))
-						return 67;
+				if ((mono_test_marshal_safearray_out_1dim_vt_bstr (out array) != 0) || (array.Rank != 1) || (array.Length != 10))
+					return 63;
+				for (int i = 0; i < 10; ++i) {
+					if (i != Convert.ToInt32 (array.GetValue (i)))
+						return 64;
+				}
+
+				if ((mono_test_marshal_safearray_out_2dim_vt_i4 (out array) != 0) || (array.Rank != 2))
+					return 65;
+				if (   (array.GetLowerBound (0) != 0) || (array.GetUpperBound (0) != 3)
+					|| (array.GetLowerBound (1) != 0) || (array.GetUpperBound (1) != 2))
+					return 66;
+				for (int i = array.GetLowerBound (0); i <= array.GetUpperBound (0); ++i)
+				{
+					for (int j = array.GetLowerBound (1); j <= array.GetUpperBound (1); ++j) {
+						if ((i + 1) * 10 + (j + 1) != (int)array.GetValue (new long[] { i, j }))
+							return 67;
+					}
 				}
-			}
 
-			if ((mono_test_marshal_variant_out_safearray_4dim_vt_int (out array) != 0) || (array.Rank != 4))
-				return 68;
-			if (   (array.GetLowerBound (0) != 15) || (array.GetUpperBound (0) != 24)
-				|| (array.GetLowerBound (1) != 20) || (array.GetUpperBound (1) != 22)
-				|| (array.GetLowerBound (2) !=  5) || (array.GetUpperBound (2) != 10)
-				|| (array.GetLowerBound (3) != 12) || (array.GetUpperBound (3) != 18) )
-				return 69;
-
-			int index = 0;
-			for (int i = array.GetLowerBound (3); i <= array.GetUpperBound (3); ++i) {
-				for (int j = array.GetLowerBound (2); j <= array.GetUpperBound (2); ++j) {
-					for (int k = array.GetLowerBound (1); k <= array.GetUpperBound (1); ++k) {
-						for (int l = array.GetLowerBound (0); l <= array.GetUpperBound (0); ++l) {
-							if (index != (int)array.GetValue (new long[] { l, k, j, i }))
-								return 70;
-							++index;
+				if ((mono_test_marshal_safearray_out_4dim_vt_i4 (out array) != 0) || (array.Rank != 4))
+					return 68;
+				if (   (array.GetLowerBound (0) != 15) || (array.GetUpperBound (0) != 24)
+					|| (array.GetLowerBound (1) != 20) || (array.GetUpperBound (1) != 22)
+					|| (array.GetLowerBound (2) !=  5) || (array.GetUpperBound (2) != 10)
+					|| (array.GetLowerBound (3) != 12) || (array.GetUpperBound (3) != 18) )
+					return 69;
+
+				int index = 0;
+				for (int i = array.GetLowerBound (3); i <= array.GetUpperBound (3); ++i) {
+					for (int j = array.GetLowerBound (2); j <= array.GetUpperBound (2); ++j) {
+						for (int k = array.GetLowerBound (1); k <= array.GetUpperBound (1); ++k) {
+							for (int l = array.GetLowerBound (0); l <= array.GetUpperBound (0); ++l) {
+								if (index != (int)array.GetValue (new long[] { l, k, j, i }))
+									return 70;
+								++index;
+							}
 						}
 					}
 				}
+
+				/* in */
+
+				array = new object[] { };
+				if (mono_test_marshal_safearray_in_byval_1dim_empty (array) != 0)
+					return 71;
+
+				array = new object[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+				if (mono_test_marshal_safearray_in_byval_1dim_vt_i4 (array) != 0)
+					return 72;
+
+				array = new object[] { 0, "1", 2, "3", 4, "5", 6, "7", 8, "9", 10, "11", 12 };
+				if (mono_test_marshal_safearray_in_byval_1dim_vt_mixed (array) != 0)
+					return 73;
+				if ((int)array.GetValue (0) != 0)
+					return 74;
+
+				array = new object[,] { { 11, 12, 13, 14 }, { 21, 22, 23, 24 } };
+				if (mono_test_marshal_safearray_in_byval_2dim_vt_i4 (array) != 0)
+					return 75;
+				if ((int)array.GetValue (new int[] { 0, 0 }) != 11)
+					return 76;
+
+				array = new object[,,] { { { "111", "112", "113" }, { "121", "122", "123" } }, { { "211", "212", "213" }, { "221", "222", "223" } } };
+				if (mono_test_marshal_safearray_in_byval_3dim_vt_bstr (array) != 0)
+					return 77;
+				if ((string)array.GetValue (new int[] { 0, 0, 0 }) != "111")
+					return 78;
+
+				array = new object[,,] { { { "111", "112", "113" }, { "121", "122", "123" } }, { { "211", "212", "213" }, { "221", "222", "223" } } };
+				if ((mono_test_marshal_safearray_in_byref_3dim_vt_bstr (ref array) != 0) || (array.Rank != 3) || (array.Length != 12))
+					return 79;
+				if ((string)array.GetValue (new int[] { 0, 0, 0 }) != "111")
+					return 80;
+
+				/* in, out, byref */
+
+				array = new object[] { };
+				if ((mono_test_marshal_safearray_in_out_byref_1dim_empty (ref array) != 0) || (array.Rank != 1) || (array.Length != 8))
+					return 81;
+				for (int i = 0; i < 8; ++i)
+				{
+					if (i != Convert.ToInt32 (array.GetValue (i)))
+						return 82;
+				}
+
+				array = new object[,,] { { { "111", "112", "113" }, { "121", "122", "123" } }, { { "211", "212", "213" }, { "221", "222", "223" } } };
+				if ((mono_test_marshal_safearray_in_out_byref_3dim_vt_bstr (ref array) != 0) || (array.Rank != 1) || (array.Length != 8))
+					return 83;
+				for (int i = 0; i < 8; ++i)
+				{
+					if (i != Convert.ToInt32 (array.GetValue (i)))
+						return 84;
+				}
+
+				array = new object[] { 1 };
+				if ((mono_test_marshal_safearray_in_out_byref_1dim_vt_i4 (ref array) != 0) || (array.Rank != 1) || (array.Length != 1))
+				{
+				    return 85;
+				}
+				if (Convert.ToInt32 (array.GetValue (0)) != -1)
+				    return 86;
+
+				/* in, out, byval */
+
+				array = new object[] { 1 };
+				if ((mono_test_marshal_safearray_in_out_byval_1dim_vt_i4 (array) != 0) || (array.Rank != 1) || (array.Length != 1))
+				{
+					return 87;
+				}
+				if (Convert.ToInt32 (array.GetValue (0)) != 12345)
+					return 88;
+
+				array = new object[,,] { { { "111", "112", "113" }, { "121", "122", "123" } }, { { "211", "212", "213" }, { "221", "222", "223" } } };
+				if ((mono_test_marshal_safearray_in_out_byval_3dim_vt_bstr (array) != 0) || (array.Rank != 3) || (array.Length != 12))
+				{
+				    return 89;
+				}
+				if (Convert.ToInt32 (array.GetValue (new int[] { 1, 1, 1 })) != 111)
+					return 90;
+				if (Convert.ToInt32 (array.GetValue (new int[] { 1, 1, 2 })) != 333)
+					return 91;
+				if (Convert.ToString(array.GetValue (new int[] { 0, 1, 0 })) != "ABCDEFG")
+					return 92;
+
+				/* Multiple safearray parameters with various types and options */
+
+				Array array1 = new object[] { 1 };
+				Array array2 = new object[,] { { 11, 12, 13, 14 }, { 21, 22, 23, 24 } };
+				Array array3 = new object[] { 0, "1", 2, "3", 4, "5", 6, "7", 8, "9", 10, "11", 12 };
+				Array array4 = new object[,,] { { { "111", "112", "113" }, { "121", "122", "123" } }, { { "211", "212", "213" }, { "221", "222", "223" } } };
+				if (    (mono_test_marshal_safearray_mixed (array1, out array2, array3, ref array4) != 0)
+					 || (array1.Rank != 1) || (array1.Length != 1) || (Convert.ToInt32 (array1.GetValue (0)) != 12345)
+					 || (array2.Rank != 1) || (array2.Length != 10)
+					 || (array4.Rank != 1) || (array4.Length != 8)
+					)
+				{
+					return 93;
+				}
+				for (int i = 0; i < 10; ++i)
+				{
+					if (i != Convert.ToInt32 (array2.GetValue (i)))
+						return 94;
+				}
+				if ((int)array3.GetValue (0) != 0)
+					return 95;
+				for (int i = 0; i < 8; ++i)
+				{
+					if (i != Convert.ToInt32 (array4.GetValue (i)))
+						return 96;
+				}
 			}
 			#endregion // SafeArray Tests
+
+			#region COM Visible Test
+			TestVisible test_vis = new TestVisible();
+			IntPtr pDisp = Marshal.GetIDispatchForObject(test_vis);
+			if (pDisp == IntPtr.Zero)
+				return 200;
+			#endregion 
 		}
 
         return 0;
@@ -526,6 +787,7 @@ public class Tests
 		void ITestIn ([MarshalAs (UnmanagedType.Interface)]ITest val);
 		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
 		void ITestOut ([MarshalAs (UnmanagedType.Interface)]out ITest val);
+		int Return22NoICall();
 	}
 
 	[ComImport ()]
@@ -577,8 +839,95 @@ public class Tests
 		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
 		[PreserveSig ()]
 		int ITestOut ([MarshalAs (UnmanagedType.Interface)]out ITestPresSig val);
+		[PreserveSig ()]
+		int Return22NoICall();
+	}
+
+	[System.Runtime.InteropServices.GuidAttribute ("00000000-0000-0000-0000-000000000002")]
+	[System.Runtime.InteropServices.ComImportAttribute ()]
+	[System.Runtime.InteropServices.ClassInterfaceAttribute (ClassInterfaceType.None)]
+	public class _TestClass : ITest
+	{
+		// properties need to go first since mcs puts them there
+		public virtual extern ITest Test
+		{
+			[return: MarshalAs (UnmanagedType.Interface)]
+			[MethodImpl (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime), DispId (5242884)]
+			get;
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void SByteIn (sbyte val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void ByteIn (byte val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void ShortIn (short val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void UShortIn (ushort val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void IntIn (int val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void UIntIn (uint val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void LongIn (long val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void ULongIn (ulong val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void FloatIn (float val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void DoubleIn (double val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void ITestIn ([MarshalAs (UnmanagedType.Interface)]ITest val);
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern void ITestOut ([MarshalAs (UnmanagedType.Interface)]out ITest val);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+		public virtual extern int Return22NoICall();
+	}
+
+	[System.Runtime.InteropServices.GuidAttribute ("00000000-0000-0000-0000-000000000002")]
+	public class TestClass : _TestClass
+	{
+		static TestClass ()
+		{
+			ExtensibleClassFactory.RegisterObjectCreationCallback (new ObjectCreationDelegate (CreateObject)); ;
+		}
+		private static System.IntPtr CreateObject (System.IntPtr aggr)
+		{
+			IntPtr pUnk3;
+			mono_test_marshal_com_object_create (out pUnk3);
+			return pUnk3;
+		}
 	}
 
+	[System.Runtime.InteropServices.GuidAttribute ("00000000-0000-0000-0000-000000000003")]
+	public class TestActivatorClass : _TestClass
+	{
+		static TestActivatorClass ()
+		{
+			ExtensibleClassFactory.RegisterObjectCreationCallback (new ObjectCreationDelegate (CreateObject)); ;
+		}
+		private static System.IntPtr CreateObject (System.IntPtr aggr)
+		{
+			IntPtr pUnk3;
+			mono_test_marshal_com_object_create (out pUnk3);
+			return pUnk3;
+		}
+	}
+
+	delegate void SByteInDelegate (sbyte val);
+	delegate void ByteInDelegate (byte val);
+	delegate void ShortInDelegate (short val);
+	delegate void UShortInDelegate (ushort val);
+	delegate void IntInDelegate (int val);
+	delegate void UIntInDelegate (uint val);
+	delegate void LongInDelegate (long val);
+	delegate void ULongInDelegate (ulong val);
+	delegate void FloatInDelegate (float val);
+	delegate void DoubleInDelegate (double val);
+	delegate void ITestInDelegate (ITest val);
+	delegate void ITestOutDelegate (out ITest val);
+
 	public class ManagedTestPresSig : ITestPresSig
 	{		// properties need to go first since mcs puts them there
 		public ITestPresSig Test
@@ -673,6 +1022,11 @@ public class Tests
 			val = new ManagedTestPresSig ();
 			return 0;
 		}
+
+		public int Return22NoICall()
+		{
+			return 88;
+		}
 	}
 
 	public class ManagedTest : ITest
@@ -762,6 +1116,11 @@ public class Tests
 				return new ManagedTest ();
 			}
 		}
+
+		public int Return22NoICall()
+		{
+			return 99;
+		}
 	}
 
 	public static int mono_test_marshal_variant_in_callback (VarEnum vt, object obj)
@@ -939,4 +1298,48 @@ public class Tests
 			return 1011;
 		return 0;
 	}
+
+	public static int TestITestDelegate (ITest itest)
+	{
+		try {
+			ITest itest2;
+
+			SByteInDelegate SByteInFcn= itest.SByteIn;
+			ByteInDelegate ByteInFcn = itest.ByteIn;
+			UShortInDelegate UShortInFcn = itest.UShortIn;
+			IntInDelegate IntInFcn = itest.IntIn;
+			UIntInDelegate UIntInFcn = itest.UIntIn;
+			LongInDelegate LongInFcn = itest.LongIn;
+
+			ULongInDelegate ULongInFcn = itest.ULongIn;
+			FloatInDelegate FloatInFcn = itest.FloatIn;
+			DoubleInDelegate DoubleInFcn = itest.DoubleIn;
+			ITestInDelegate ITestInFcn = itest.ITestIn;
+			ITestOutDelegate ITestOutFcn = itest.ITestOut;
+
+			SByteInFcn (-100);
+			ByteInFcn (100);
+			UShortInFcn (100);
+			IntInFcn (-100);
+			UIntInFcn (100);
+			LongInFcn (-100);
+			ULongInFcn (100);
+			FloatInFcn (3.14f);
+			DoubleInFcn (3.14);
+			ITestInFcn (itest);
+			ITestOutFcn (out itest2);
+		}
+		catch (Exception) {
+			return 1;
+		}
+		return 0;
+	}
+
+	public static int TestIfaceNoIcall (ITestPresSig itest) {
+		return itest.Return22NoICall () == 22 ? 0 : 1;
+	}
+}
+
+public class TestVisible
+{
 }