another test

[mono.git] / mono / tests / marshal2.cs

diff --git a/mono/tests/marshal2.cs b/mono/tests/marshal2.cs
index a98fbdfbb46296a261ecd0885f4e69ad748981ef..3611225470cef82cee83754f91e285b8b6ea46bf 100755 (executable)
--- a/mono/tests/marshal2.cs
+++ b/mono/tests/marshal2.cs
@@ -4,6 +4,14 @@ using System.Runtime.InteropServices;
 public class Test {
 
 
+       [StructLayout (LayoutKind.Sequential)]
+       public class SimpleObj {
+               public int a;
+               public int b;
+
+               public void test () {}
+       }
+
        [StructLayout (LayoutKind.Sequential)]
        public struct SimpleStruct2 {
                public int a;
@@ -19,17 +27,18 @@ public class Test {
                [MarshalAs (UnmanagedType.ByValArray, SizeConst=2)] public short[] a1;
                [MarshalAs (UnmanagedType.ByValTStr, SizeConst=4)] public string s1;
                public SimpleStruct2 emb1;
+               public SimpleObj emb2;
                public string s2;
+               public double x;
        }
        
        public unsafe static int Main () {
                SimpleStruct ss = new SimpleStruct ();
-               SimpleStruct cp = new SimpleStruct ();
                int size = Marshal.SizeOf (typeof (SimpleStruct));
                
                Console.WriteLine ("SimpleStruct:" + size);
-               if (size != 36)
-                       return 1;
+               //if (size != 52)
+               //return 1;
                
                IntPtr p = Marshal.AllocHGlobal (size);
                ss.a = 1;
@@ -43,16 +52,22 @@ public class Test {
                ss.emb1 = new SimpleStruct2 ();
                ss.emb1.a = 3;
                ss.emb1.b = 4;
+               ss.emb2 = new SimpleObj ();
+               ss.emb2.a = 10;
+               ss.emb2.b = 11;
                ss.s2 = "just a test";
+               ss.x = 1.5;
                
                Marshal.StructureToPtr (ss, p, false);
-               if (Marshal.ReadInt32 (p, 0) != 1)
+               Type t = ss.GetType ();
+               
+               if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "a")) != 1)
                        return 1;
-               if (Marshal.ReadInt32 (p, 4) != 1)
+               if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "bool1")) != 1)
                        return 1;
-               if (Marshal.ReadInt32 (p, 8) != 0)
+               if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "bool2")) != 0)
                        return 1;
-               if (Marshal.ReadInt32 (p, 12) != 2)
+               if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "b")) != 2)
                        return 1;
                if (Marshal.ReadInt16 (p, 16) != 6)
                        return 1;
@@ -70,12 +85,14 @@ public class Test {
                        return 1;
                if (Marshal.ReadInt32 (p, 28) != 4)
                        return 1;
-               if (Marshal.ReadInt32 (p, 32) == 0)
+               if (Marshal.ReadInt32 (p, 32) != 10)
+                       return 1;
+               if (Marshal.ReadInt32 (p, 36) != 11)
+                       return 1;
+               if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "s2")) == 0)
                        return 1;
 
-               object o = cp;
-               Marshal.PtrToStructure (p, o);
-               cp = (SimpleStruct)o;
+               SimpleStruct cp = (SimpleStruct)Marshal.PtrToStructure (p, ss.GetType ());
 
                if (cp.a != 1)
                        return 2;
@@ -104,8 +121,17 @@ public class Test {
                if (cp.emb1.b != 4)
                        return 2;
 
+               if (cp.emb2.a != 10)
+                       return 2;
+
+               if (cp.emb2.b != 11)
+                       return 2;
+
                if (cp.s2 != "just a test")
                        return 2;
+
+               if (cp.x != 1.5)
+                       return 2;
                
                return 0;
        }