Author: martin
Date: 2005-04-13 07:45:28 -0400 (Wed, 13 Apr 2005)
New Revision: 42911

Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/attribute.cs
Log:
**** Merged r41284 from MCS ****


Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2005-04-13 11:45:00 UTC (rev 42910)
+++ trunk/mcs/gmcs/ChangeLog    2005-04-13 11:45:28 UTC (rev 42911)
@@ -1,3 +1,8 @@
+2005-02-28  Zoltan Varga  <[EMAIL PROTECTED]>
+
+       * attribute.cs (GetMarshal): Marshal SizeConst and SizeParamIndex 
+       fields as well.
+
 2005-02-28  Marek Safar  <[EMAIL PROTECTED]>
 
        * attribute.cs: Small refactoring (improved robustness).

Modified: trunk/mcs/gmcs/attribute.cs
===================================================================
--- trunk/mcs/gmcs/attribute.cs 2005-04-13 11:45:00 UTC (rev 42910)
+++ trunk/mcs/gmcs/attribute.cs 2005-04-13 11:45:28 UTC (rev 42911)
@@ -912,7 +912,7 @@
                        UnmanagedType array_sub_type = o == null ? 
UnmanagedType.I4 : (UnmanagedType) o;
                        
                        switch (UnmanagedType) {
-                       case UnmanagedType.CustomMarshaler:
+                       case UnmanagedType.CustomMarshaler: {
                                MethodInfo define_custom = typeof 
(UnmanagedMarshal).GetMethod ("DefineCustom",
                                                                        
BindingFlags.Static | BindingFlags.Public);
                                if (define_custom == null) {
@@ -926,10 +926,27 @@
                                args [2] = GetFieldValue ("MarshalType");
                                args [3] = Guid.Empty;
                                return (UnmanagedMarshal) define_custom.Invoke 
(null, args);
+                       }
+                       case UnmanagedType.LPArray: {
+                               object size_const = GetFieldValue ("SizeConst");
+                               object size_param_index = GetFieldValue 
("SizeParamIndex");
+
+                               if ((size_const != null) || (size_param_index 
!= null)) {
+                                       MethodInfo define_array = typeof 
(UnmanagedMarshal).GetMethod ("DefineLPArrayInternal", BindingFlags.Static | 
BindingFlags.Public | BindingFlags.NonPublic);
+                                       if (define_array == null) {
+                                               Report.RuntimeMissingSupport 
(Location, "set marshal info");
+                                               return null;
+                                       }
                                
-                       case UnmanagedType.LPArray:                             
-                               return UnmanagedMarshal.DefineLPArray 
(array_sub_type);
-                       
+                                       object [] args = new object [3];
+                                       args [0] = array_sub_type;
+                                       args [1] = size_const;
+                                       args [2] = size_param_index;
+                                       return (UnmanagedMarshal) 
define_array.Invoke (null, args);
+                               }
+                               else
+                                       return UnmanagedMarshal.DefineLPArray 
(array_sub_type);
+                       }
                        case UnmanagedType.SafeArray:
                                return UnmanagedMarshal.DefineSafeArray 
(array_sub_type);
                        

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to