New test.

[mono.git] / mcs / class / corlib / System.Reflection / MethodBase.cs

diff --git a/mcs/class/corlib/System.Reflection/MethodBase.cs b/mcs/class/corlib/System.Reflection/MethodBase.cs
index 01f793efb213b5f3aebe75fa05fdde5f57afca80..0f9c0452f2b248ef9ef7097d7343c56c14ff32fe 100644 (file)
--- a/mcs/class/corlib/System.Reflection/MethodBase.cs
+++ b/mcs/class/corlib/System.Reflection/MethodBase.cs
@@ -5,10 +5,7 @@
 //   Paolo Molaro (lupus@ximian.com)
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
-//
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -30,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.Reflection.Emit;
@@ -39,16 +35,22 @@ using System.Runtime.InteropServices;
 
 namespace System.Reflection {
 
+#if NET_2_0
+       [ComVisible (true)]
+       [ComDefaultInterfaceAttribute (typeof (_MethodBase))]
+#endif
        [Serializable]
-       [ClassInterface(ClassInterfaceType.AutoDual)]
-       public abstract class MethodBase: MemberInfo {
+       [ClassInterface(ClassInterfaceType.None)]
+       public abstract class MethodBase: MemberInfo, _MethodBase {
 
                [MethodImplAttribute (MethodImplOptions.InternalCall)]
                public extern static MethodBase GetCurrentMethod ();
 
-               public static MethodBase GetMethodFromHandle(RuntimeMethodHandle handle)
-               {
-                       return null;
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               private extern static MethodBase GetMethodFromHandleInternal(IntPtr handle);
+
+               public static MethodBase GetMethodFromHandle(RuntimeMethodHandle handle) {
+                       return GetMethodFromHandleInternal (handle.Value);
                }
 
                public abstract MethodImplAttributes GetMethodImplementationFlags();
@@ -68,6 +70,13 @@ namespace System.Reflection {
                        return pi.Length;
                }
 
+#if ONLY_1_1
+               public new Type GetType ()
+               {
+                       return base.GetType ();
+               }
+#endif
+
                [DebuggerHidden]
                [DebuggerStepThrough]           
 #if NET_2_0 || BOOTSTRAP_NET_2_0
@@ -168,38 +177,61 @@ namespace System.Reflection {
                }
 
 #if NET_2_0 || BOOTSTRAP_NET_2_0
-               public virtual MethodInfo BindGenericParameters (Type [] types)
-               {
-                       throw new NotSupportedException ();
-               }
-
                public virtual Type [] GetGenericArguments ()
                {
                        throw new NotSupportedException ();
                }
 
-               public virtual MethodInfo GetGenericMethodDefinition ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public virtual bool Mono_IsInflatedMethod {
+               public virtual bool ContainsGenericParameters {
                        get {
-                               throw new NotSupportedException ();
+                               return false;
                        }
                }
 
-               public virtual bool HasGenericParameters {
+               public virtual bool IsGenericMethodDefinition {
                        get {
                                throw new NotSupportedException ();
                        }
                }
 
-               public virtual bool IsGenericMethodDefinition {
+               public virtual bool IsGenericMethod {
                        get {
                                throw new NotSupportedException ();
                        }
                }
 #endif
+
+#if NET_2_0
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               internal extern static MethodBody GetMethodBodyInternal (IntPtr handle);
+
+               internal static MethodBody GetMethodBody (IntPtr handle) {
+                       return GetMethodBodyInternal (handle);
+               }
+
+               public virtual MethodBody GetMethodBody () {
+                       throw new NotSupportedException ();
+               }
+#endif
+
+               void _MethodBase.GetIDsOfNames ([In] ref Guid riid, IntPtr rgszNames, uint cNames, uint lcid, IntPtr rgDispId)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               void _MethodBase.GetTypeInfo (uint iTInfo, uint lcid, IntPtr ppTInfo)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               void _MethodBase.GetTypeInfoCount (out uint pcTInfo)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               void _MethodBase.Invoke (uint dispIdMember, [In] ref Guid riid, uint lcid, short wFlags, IntPtr pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, IntPtr puArgErr)
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }