Revert Gert's patch until its fixed

svn path=/trunk/mcs/; revision=29642

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs b/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs
index 590e9ad00d76e7d5c6d9fc4b3457d307bc33d004..8b99ac845e01b50257ab6df83123bf44c7d03013 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ArrayWithOffset.cs
@@ -64,7 +64,7 @@ namespace System.Runtime.InteropServices {
                        return array;
                }                               
 
-               public int GetOffset ()
+               public object GetOffset ()
                {
                        return offset;
                }                               

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CONNECTDATA.cs b/mcs/class/corlib/System.Runtime.InteropServices/CONNECTDATA.cs
index c0faf6beec9b4b89cc1bffda60dd7170bdc1af07..caaeb71cd77e3aac6541f4a523955127f66c5046 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/CONNECTDATA.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/CONNECTDATA.cs
@@ -34,7 +34,6 @@ namespace System.Runtime.InteropServices
        public struct CONNECTDATA
        {
                public int dwCookie;
-               [MarshalAs (UnmanagedType.Interface)]
                public object pUnk;
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index f4608b0c24358e30665e0d70f3d2c174f5412408..55250826907da089324cf1bef84731b1047bd361 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,33 +1,3 @@
-2004-06-15  Gert Driesen <drieseng@users.sourceforge.net>
-
-       * ArrayWithOffset.cs: fixed GetOffset to return int instead of
-       object
-       * CONNECTDATA.cs: added missing MarshalAs attribute
-       * EXCEPINFO.cs: added missing MarshalAs attributes
-       * ITypeLibConverter.cs:
-       * ITypeLibImporterNotifySink.cs: 
-       * Marshal.cs: added missing MarshalAs attributues, and missing
-       Out attributes
-       * TypeLibConverter.cs: added missing MarshalAs attributes
-       * UCOMIBindCtx.cs: 
-       * UCOMIConnectionPoint.cs:
-       * UCOMIEnumConnectionPoints.cs:
-       * UCOMIEnumConnections.cs: added missing PreserveSig attributes,
-       added missing MarshalAs attributes
-       * UCOMIEnumMoniker.cs: added missing PreserveSig attributes,
-       added missing MarshalAs attributes
-       * UCOMIEnumString.cs: added missing PreserveSig attributes,
-       added missing MarshalAs attributes
-       * UCOMIMoniker.cs: added missing MarshalAs attributes
-       * UCOMIPersistFile.cs: added missing PreserveSig attribute,
-       added missing MarshalAs attributes
-       * UCOMIRunningObjectTable.cs: added missing MarshalAs attributes
-       * UCOMIStream.cs: added missing MarshalAs attributes
-       * UCOMITypeComp.cs: added missing MarshalAs attributes
-       * UCOMITypeInfo.cs: added missing MarshalAs attributes
-       * UCOMITypeLib.cs: added missing PreserveSig attributes, added
-       missing MarshalAs attributes
-
 2004-05-30  Gert Driesen (drieseng@users.sourceforge.net)
 
        * SetWin32ContextInIDispatchAttribute.cs: only build

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
index b012359002b4b6c8c446f39a459c75735114b60f..7c5339c06bce88fb67f9bd6cdda38f60cdc09f6f 100755 (executable)
--- a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
@@ -35,11 +35,8 @@ namespace System.Runtime.InteropServices
 
        [ComVisible(false)]
        public struct EXCEPINFO {
-               [MarshalAs (UnmanagedType.BStr)]
                public string bstrDescription;
-               [MarshalAs (UnmanagedType.BStr)]
                public string bstrHelpFile;
-               [MarshalAs (UnmanagedType.BStr)]
                public string bstrSource;
                public int dwHelpContext;
                public IntPtr pfnDeferredFillIn;

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs b/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs
index 341841d62012a61c37a3a58ab97ac9b2dd656ca5..27a3c9cbbce17f1fd00b3e351eca9bcfb604f4d5 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/InvalidComObjectException.cs
@@ -33,7 +33,6 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-       [Serializable]
        public class InvalidComObjectException : SystemException
        {
                private const int ErrorCode = -2146233049; // = 0x80131527

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs b/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
index 530b5983d81923d8dcd6829dd13a72a62d576d5a..2f8c30c8f8a9ec9f4aa1d35064ad4b88604b0111 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/InvalidOleVariantTypeException.cs
@@ -33,7 +33,6 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-       [Serializable]
        public class InvalidOleVariantTypeException : SystemException
        {
                private const int ErrorCode = -2146233039; // = 0x80131531

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
index 7a3c51b043e64aac96184f9234c69a609948630c..55fa039678b432740d5839b4d83cce52d125fbb2 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -376,7 +376,7 @@ namespace System.Runtime.InteropServices
                public extern static byte ReadByte (IntPtr ptr, int ofs);
 
                [MonoTODO]
-               public static byte ReadByte ([In, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs) {
+               public static byte ReadByte ([In] object ptr, int ofs) {
                        throw new NotImplementedException ();
                }
 
@@ -388,7 +388,7 @@ namespace System.Runtime.InteropServices
                public extern static short ReadInt16 (IntPtr ptr, int ofs);
 
                [MonoTODO]
-               public static short ReadInt16 ([In, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs) {
+               public static short ReadInt16 ([In] object ptr, int ofs) {
                        throw new NotImplementedException ();
                }
 
@@ -400,7 +400,7 @@ namespace System.Runtime.InteropServices
                public extern static int ReadInt32 (IntPtr ptr, int ofs);
 
                [MonoTODO]
-               public static int ReadInt32 ([In, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs) {
+               public static int ReadInt32 ([In] object ptr, int ofs) {
                        throw new NotImplementedException ();
                }
 
@@ -412,7 +412,7 @@ namespace System.Runtime.InteropServices
                public extern static long ReadInt64 (IntPtr ptr, int ofs);
 
                [MonoTODO]
-               public static long ReadInt64 ([In, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs) {
+               public static long ReadInt64([In] object ptr, int ofs) {
                        throw new NotImplementedException ();
                }
 
@@ -424,7 +424,7 @@ namespace System.Runtime.InteropServices
                public extern static IntPtr ReadIntPtr (IntPtr ptr, int ofs);
 
                [MonoTODO]
-               public static IntPtr ReadIntPtr ([In, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs) {
+               public static IntPtr ReadIntPtr([In] object ptr, int ofs) {
                        throw new NotImplementedException ();
                }
 
@@ -531,7 +531,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteByte (IntPtr ptr, int ofs, byte val);
 
                [MonoTODO]
-               public static void WriteByte ([In, Out, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs, byte val) {
+               public static void WriteByte([In,Out] object ptr, int ofs, byte val) {
                        throw new NotImplementedException ();
                }
 
@@ -543,7 +543,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteInt16 (IntPtr ptr, int ofs, short val);
 
                [MonoTODO]
-               public static void WriteInt16 ([In, Out, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs, short val) {
+               public static void WriteInt16([In,Out] object ptr, int ofs, short val) {
                        throw new NotImplementedException ();
                }
 
@@ -556,7 +556,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteInt16 (IntPtr ptr, int ofs, char val);
 
                [MonoTODO]
-               public static void WriteInt16([In, Out, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs, char val) {
+               public static void WriteInt16([In,Out] object ptr, int ofs, char val) {
                        throw new NotImplementedException ();
                }
 
@@ -568,7 +568,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteInt32 (IntPtr ptr, int ofs, int val);
 
                [MonoTODO]
-               public static void WriteInt32([In, Out, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs, int val) {
+               public static void WriteInt32([In,Out] object ptr, int ofs, int val) {
                        throw new NotImplementedException ();
                }
 
@@ -580,7 +580,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteInt64 (IntPtr ptr, int ofs, long val);
 
                [MonoTODO]
-               public static void WriteInt64 ([In, Out, MarshalAs (UnmanagedType.AsAny)] object ptr, int ofs, long val) {
+               public static void WriteInt64([In] object ptr, int ofs, long val) {
                        throw new NotImplementedException ();
                }
 
@@ -592,7 +592,7 @@ namespace System.Runtime.InteropServices
                public extern static void WriteIntPtr (IntPtr ptr, int ofs, IntPtr val);
 
                [MonoTODO]
-               public static void WriteIntPtr([In, Out, MarshalAs(UnmanagedType.AsAny)] object ptr, int ofs, IntPtr val) {
+               public static void WriteIntPtr([In] object ptr, int ofs, IntPtr val) {
                        throw new NotImplementedException ();
                }
 

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs b/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs
index e75092dbebfec08e84ff7a2b1b119d8c65df84cb..37806b89a8300322167984e09452454b36c9cce0 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/MarshalDirectiveException.cs
@@ -33,7 +33,6 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-       [Serializable]
        public class MarshalDirectiveException : SystemException
        {
                private const int ErrorCode = -2146233035; // = 0x80131535

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
index 38bc4be1a4740e52dbb97fc6f8c81e649de34321..75897a096f82c6a0fccaeb407bbfe2e8e5db26a5 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayRankMismatchException.cs
@@ -33,7 +33,6 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-       [Serializable]
        public class SafeArrayRankMismatchException : SystemException
        {
                private const int ErrorCode = -2146233032; // = 0x80131538

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
index 55032d4c84cf58e75c655b80269e2eefab4d261c..26aeff8ff3e29081c13ba13c38a0197ee4b5d799 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/SafeArrayTypeMismatchException.cs
@@ -33,7 +33,6 @@ using System.Runtime.Serialization;
 
 namespace System.Runtime.InteropServices
 {
-       [Serializable]
        public class SafeArrayTypeMismatchException : SystemException
        {
                private const int ErrorCode = -2146233037; // = 0x80131533

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibConverter.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibConverter.cs
index 24e3fe3d0a46ec7d452bb0c28fb54fa7ae91fb4a..7fc3c9e5b181ea9f8914675ae4e02c0a64c80106 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibConverter.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibConverter.cs
@@ -49,13 +49,13 @@ namespace System.Runtime.InteropServices
                }
 
                [MonoTODO ("implement")]
-               public AssemblyBuilder ConvertTypeLibToAssembly ([MarshalAs(UnmanagedType.Interface)] object typeLib, string asmFileName, int flags, ITypeLibImporterNotifySink notifySink, byte[] publicKey, StrongNameKeyPair keyPair, bool unsafeInterfaces)
+               public AssemblyBuilder ConvertTypeLibToAssembly (object typeLib, string asmFileName, int flags, ITypeLibImporterNotifySink notifySink, byte[] publicKey, StrongNameKeyPair keyPair, bool unsafeInterfaces)
                {
                        throw new NotImplementedException ();
                }
 
                [MonoTODO ("implement")]
-               public AssemblyBuilder ConvertTypeLibToAssembly ([MarshalAs(UnmanagedType.Interface)] object typeLib, string asmFileName, TypeLibImporterFlags flags, ITypeLibImporterNotifySink notifySink, byte[] publicKey, StrongNameKeyPair keyPair, string asmNamespace, Version asmVersion)
+               public AssemblyBuilder ConvertTypeLibToAssembly (object typeLib, string asmFileName, TypeLibImporterFlags flags, ITypeLibImporterNotifySink notifySink, byte[] publicKey, StrongNameKeyPair keyPair, string asmNamespace, Version asmVersion)
                {
                        throw new NotImplementedException ();
                }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIBindCtx.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIBindCtx.cs
index 093347c100d6266e4d50d0fbe92482dfc6757140..49b61f2f130a65d875e85e9b898d481816fa7020 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIBindCtx.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIBindCtx.cs
@@ -38,13 +38,13 @@ namespace System.Runtime.InteropServices
        {
                void EnumObjectParam (out UCOMIEnumString ppenum);
                void GetBindOptions (ref BIND_OPTS pbindopts);
-               void GetObjectParam ([MarshalAs (UnmanagedType.LPWStr)] string pszKey, [MarshalAs (UnmanagedType.Interface)] out object ppunk);
+               void GetObjectParam (string pszKey, out object ppunk);
                void GetRunningObjectTable (out UCOMIRunningObjectTable pprot);
-               void RegisterObjectBound ([MarshalAs(UnmanagedType.Interface)] object punk);
-               void RegisterObjectParam ([MarshalAs (UnmanagedType.LPWStr)] string pszKey, [MarshalAs (UnmanagedType.Interface)] object punk);
+               void RegisterObjectBound (object punk);
+               void RegisterObjectParam (string pszKey, object punk);
                void ReleaseBoundObjects ();
-               void RevokeObjectBound ([MarshalAs(UnmanagedType.Interface)] object punk);
-               void RevokeObjectParam ([MarshalAs(UnmanagedType.LPWStr)] string pszKey);
+               void RevokeObjectBound (object punk);
+               void RevokeObjectParam (string pszKey);
                void SetBindOptions ([In] ref BIND_OPTS pbindopts);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
index db68af10332733e53a684a3a04c7e94f36f843e6..a59cacc3d71fc6d385826315d654bbfb0d68fa64 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
@@ -36,7 +36,7 @@ namespace System.Runtime.InteropServices
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMIConnectionPoint
        {
-               void Advise ([MarshalAs(UnmanagedType.Interface)] object pUnkSink, out int pdwCookie);
+               void Advise (object pUnkSink, out int pdwCookie);
                void EnumConnections (out UCOMIEnumConnections ppEnum);
                void GetConnectionInterface (out Guid pIID);
                void GetConnectionPointContainer (out UCOMIConnectionPointContainer ppCPC);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
index ff61cf0d2d9d3155b2e63bd904bd0e2d3442af5d..703e7d42287fe4a05cf1339aba8834618eed8591 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
@@ -38,7 +38,7 @@ namespace System.Runtime.InteropServices
        {
                void Clone (out UCOMIEnumConnectionPoints ppenum);
                [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex = 0)] UCOMIConnectionPoint[] rgelt, out int pceltFetched);
+               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex = 0)] UCOMIConnectionPoint[] rgelt, out int pceltFetched);
                [PreserveSigAttribute]
                int Reset ();
                [PreserveSigAttribute]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
index f48ad9ca86cdd3668293177b0198939e1441d8fc..1d7073abb91bc4edb8cb9563b01328d4a3a99301 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
@@ -37,11 +37,8 @@ namespace System.Runtime.InteropServices
        public interface UCOMIEnumConnections
        {
                void Clone (out UCOMIEnumConnections ppenum);
-               [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType=(UnmanagedType) 80, SizeParamIndex=0)] CONNECTDATA[] rgelt, out int pceltFetched);
-               [PreserveSigAttribute]
+               int Next (int celt, [Out] CONNECTDATA[] rgelt, out int pceltFetched);
                void Reset ();
-               [PreserveSigAttribute]
                int Skip (int celt);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
index db31e90adf65c1f4188d3315240646f5b1ccf0d7..a286d1eac5c413a2b8d816c0635546bad93e2a67 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
@@ -37,11 +37,8 @@ namespace System.Runtime.InteropServices
        public interface UCOMIEnumMoniker
        {
                void Clone (out UCOMIEnumMoniker ppenum);
-               [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex = 0)] UCOMIMoniker[] rgelt, out int pceltFetched);
-               [PreserveSigAttribute]
+               int Next (int celt, [Out] UCOMIMoniker[] rgelt, out int pceltFetched);
                int Reset ();
-               [PreserveSigAttribute]
                int Skip (int celt);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
index a675da7f4fb27a13ac96ab91e2d4766ce8657668..d982e8cc2784f57287f886dd4da1dc96615455b8 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
@@ -37,11 +37,8 @@ namespace System.Runtime.InteropServices
        public interface UCOMIEnumString
        {
                void Clone (out UCOMIEnumString ppenum);
-               [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex = 0)] string[] rgelt, out int pceltFetched);
-               [PreserveSigAttribute]
+               int Next (int celt, [Out] string[] rgelt, out int pceltFetched);
                int Reset ();
-               [PreserveSigAttribute]
                int Skip (int celt);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
index b07801ab5b75193f65b12242538f57eeb5eff682..7ef86464663aa3235c4462d9cfb2bbdc1a1b1235 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
@@ -36,13 +36,13 @@ namespace System.Runtime.InteropServices
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMIMoniker
        {
-               void BindToObject (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riidResult, [MarshalAs (UnmanagedType.Interface)] out object ppvResult);
-               void BindToStorage (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riid, [MarshalAs (UnmanagedType.Interface)] out object ppvObj);
+               void BindToObject (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riidResult, out object ppvResult);
+               void BindToStorage (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riid, out object ppvObj);
                void CommonPrefixWith (UCOMIMoniker pmkOther, out UCOMIMoniker ppmkPrefix);
-               void ComposeWith (UCOMIMoniker pmkRight, [MarshalAs (UnmanagedType.LPWStr)] bool fOnlyIfNotGeneric, out UCOMIMoniker ppmkComposite);
-               void Enum ([MarshalAs(UnmanagedType.Bool)] bool fForward, out UCOMIEnumMoniker ppenumMoniker);
+               void ComposeWith (UCOMIMoniker pmkRight, bool fOnlyIfNotGeneric, out UCOMIMoniker ppmkComposite);
+               void Enum (bool fForward, out UCOMIEnumMoniker ppenumMoniker);
                void GetClassID (out Guid pClassID);
-               void GetDisplayName (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [MarshalAs (UnmanagedType.LPWStr)] out string ppszDisplayName);
+               void GetDisplayName (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, out string ppszDisplayName);
                void GetSizeMax (out long pcbSize);
                void GetTimeOfLastChange (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, out FILETIME pFileTime);
                void Hash (out int pdwHash);
@@ -52,9 +52,9 @@ namespace System.Runtime.InteropServices
                void IsRunning (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, UCOMIMoniker pmkNewlyRunning);
                void IsSystemMoniker (out int pdwMksys);
                void Load (UCOMIStream pStm);
-               void ParseDisplayName (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [MarshalAs (UnmanagedType.LPWStr)] string pszDisplayName, out int pchEaten, out UCOMIMoniker ppmkOut);
+               void ParseDisplayName (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, string pszDisplayName, out int pchEaten, out UCOMIMoniker ppmkOut);
                void Reduce (UCOMIBindCtx pbc, int dwReduceHowFar, ref UCOMIMoniker ppmkToLeft, out UCOMIMoniker ppmkReduced);
                void RelativePathTo (UCOMIMoniker pmkOther, out UCOMIMoniker ppmkRelPath);
-               void Save (UCOMIStream pStm, [MarshalAs (UnmanagedType.Bool)] bool fClearDirty);
+               void Save (UCOMIStream pStm, bool fClearDirty);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIPersistFile.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIPersistFile.cs
index 60c3d430de7e41489a1cfa8cf5edc2ba4a890d85..64199ca29d33974cc006c070048ec91bd15df7d6 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIPersistFile.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIPersistFile.cs
@@ -37,11 +37,10 @@ namespace System.Runtime.InteropServices
        public interface UCOMIPersistFile
        {
                void GetClassID (out Guid pClassID);
-               void GetCurFile ([MarshalAs(UnmanagedType.LPWStr)] out string ppszFileName);
-               [PreserveSig]
+               void GetCurFile (out string ppszFileName);
                int IsDirty ();
-               void Load ([MarshalAs(UnmanagedType.LPWStr)] string pszFileName, int dwMode);
-               void Save ([MarshalAs (UnmanagedType.LPWStr)] string pszFileName, [MarshalAs (UnmanagedType.Bool)] bool fRemember);
-               void SaveCompleted ([MarshalAs (UnmanagedType.LPWStr)]string pszFileName);
+               void Load (string pszFileName, int dwMode);
+               void Save (string pszFileName, bool fRemember);
+               void SaveCompleted (string pszFileName);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIRunningObjectTable.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIRunningObjectTable.cs
index 5e3e14e723988cbb725211b4ce6eeff7ec307147..2456dcf9a2c40a408145e90d4c13c997597f16bc 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIRunningObjectTable.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIRunningObjectTable.cs
@@ -37,11 +37,11 @@ namespace System.Runtime.InteropServices
        public interface UCOMIRunningObjectTable
        {
                void EnumRunning (out UCOMIEnumMoniker ppenumMoniker);
-               void GetObject (UCOMIMoniker pmkObjectName, [MarshalAs (UnmanagedType.Interface)] out object ppunkObject);
+               void GetObject (UCOMIMoniker pmkObjectName, out object ppunkObject);
                void GetTimeOfLastChange (UCOMIMoniker pmkObjectName, out FILETIME pfiletime);
                void IsRunning (UCOMIMoniker pmkObjectName);
                void NoteChangeTime (int dwRegister, ref FILETIME pfiletime);
-               void Register (int grfFlags, [MarshalAs (UnmanagedType.Interface)] object punkObject, UCOMIMoniker pmkObjectName, out int pdwRegister);
+               void Register (int grfFlags, object punkObject, UCOMIMoniker pmkObjectName, out int pdwRegister);
                void Revoke (int dwRegister);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
index 7c79cfdd6a4341a60a1964953bfbdbc7dca83d54..6ce3db1a7f1cf176822310d369a3ad9959bbe351 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
@@ -41,12 +41,12 @@ namespace System.Runtime.InteropServices
                void Commit (int grfCommitFlags);
                void CopyTo (UCOMIStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten);
                void LockRegion (long libOffset, long cb, int dwLockType);
-               void Read ([Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
+               void Read ([Out] byte[] pv, int cb, IntPtr pcbRead);
                void Revert ();
                void Seek (long dlibMove, int dwOrigin, IntPtr plibNewPosition);
                void SetSize (long libNewSize);
                void Stat (out STATSTG pstatstg, int grfStatFlag);
                void UnlockRegion (long libOffset, long cb, int dwLockType);
-               void Write ([MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
+               void Write (byte[] pv, int cb, IntPtr pcbWritten);
        }
 }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
index 0f9a621a2fa90369591b97f95a9757bffe3a543d..128941d5bf53183ae146de7a69b363036503f13b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
@@ -32,10 +32,12 @@ using System;
 
 namespace System.Runtime.InteropServices
 {
+
        [Guid("00020403-0000-0000-c000-000000000046")]
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMITypeComp {
-               void Bind([MarshalAs(UnmanagedType.LPWStr)] string szName, int lHashVal, short wFlags, out UCOMITypeInfo ppTInfo, out DESCKIND pDescKind, out BINDPTR pBindPtr);
-               void BindType([MarshalAs(UnmanagedType.LPWStr)] string szName, int lHashVal, out UCOMITypeInfo ppTInfo, out UCOMITypeComp ppTComp);
+               void Bind( string szName, int lHashVal, short wFlags, out UCOMITypeInfo ppTInfo, out DESCKIND pDescKind, out BINDPTR pBindPtr);
+               void BindType( string szName, int lHashVal, out UCOMITypeInfo ppTInfo, out UCOMITypeComp ppTComp);
        }
 }
+

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
index d84d35376ca50bf23335ea356530dcf266d49081..4161e3def0bf4ca265e13464943567b2880e5a08 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
@@ -37,21 +37,21 @@ namespace System.Runtime.InteropServices
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMITypeInfo {
                void AddressOfMember (int memid, INVOKEKIND invKind, out IntPtr ppv); 
-               void CreateInstance ([MarshalAs (UnmanagedType.IUnknown)] object pUnkOuter, ref Guid riid, [MarshalAs (UnmanagedType.IUnknown)] out object ppvObj);
+               void CreateInstance (object pUnkOuter, ref Guid riid, out object ppvObj);
                void GetContainingTypeLib (out UCOMITypeLib ppTLB, out int pIndex);
                void GetDllEntry (int memid, INVOKEKIND invKind, out string pBstrDllName, out string pBstrName, out short pwOrdinal);
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                void GetFuncDesc (int index, out IntPtr ppFuncDesc);
-               void GetIDsOfNames ([In, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType.LPWStr), SizeParamIndex=1)] string[] rgszNames, int cNames, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex=1)] int[] pMemId);
+               void GetIDsOfNames ([In] string[] rgszNames, int cNames, [Out] int[] pMemId);
                void GetImplTypeFlags (int index, out int pImplTypeFlags);
                void GetMops (int memid, out string pBstrMops);
-               void GetNames (int memid, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80, SizeParamIndex=2)] string[] rgBstrNames, int cMaxNames, out int pcNames);
+               void GetNames (int memid, [Out] string[] rgBstrNames, int cMaxNames, out int pcNames);
                void GetRefTypeInfo (int hRef, out UCOMITypeInfo ppTI);
                void GetRefTypeOfImplType (int index, out int href);
                void GetTypeAttr (out IntPtr ppTypeAttr);
                void GetTypeComp (out UCOMITypeComp ppTComp);
                void GetVarDesc (int index, out IntPtr ppVarDesc);
-               void Invoke ([MarshalAs (UnmanagedType.IUnknown)] object pvInstance, int memid, short wFlags, ref DISPPARAMS pDispParams, out object pVarResult, out EXCEPINFO pExcepInfo, out int puArgErr);
+               void Invoke (object pvInstance, int memid, short wFlags, ref DISPPARAMS pDispParams, out object pVarResult, out EXCEPINFO pExcepInfo, out int puArgErr);
                void ReleaseFuncDesc (IntPtr pFuncDesc);
                void ReleaseTypeAttr (IntPtr pTypeAttr);
                void ReleaseVarDesc (IntPtr pVarDesc);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
index 02ceae677313e2953f2fc65aab5a54d1cde2a555..6a1db815d4697ad5a7fc065de018544847556d37 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
@@ -37,19 +37,16 @@ namespace System.Runtime.InteropServices
        [Guid("00020402-0000-0000-c000-000000000046")]
        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMITypeLib { 
-               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80)] UCOMITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = (UnmanagedType) 80)] int[] rgMemId, ref short pcFound);
-               void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
-               void GetLibAttr (out IntPtr ppTLibAttr);
-               void GetTypeComp (out UCOMITypeComp ppTComp); 
-               void GetTypeInfo (int index, out UCOMITypeInfo ppTI);
-               [PreserveSig]
-               int GetTypeInfoCount ();
-               void GetTypeInfoOfGuid (ref Guid guid, out UCOMITypeInfo ppTInfo);
-               void GetTypeInfoType (int index, out TYPEKIND pTKind);
-               [return: MarshalAs (UnmanagedType.Bool)]
-               bool IsName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal);
-               [PreserveSig]
-               void ReleaseTLibAttr (IntPtr pTLibAttr);
+               void FindName( string szNameBuf, int lHashVal, [Out] UCOMITypeInfo[] ppTInfo, [Out] int[] rgMemId, ref short pcFound);
+               void GetDocumentation( int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
+               void GetLibAttr( out IntPtr ppTLibAttr);
+               void GetTypeComp( out UCOMITypeComp ppTComp); 
+               void GetTypeInfo( int index, out UCOMITypeInfo ppTI);
+               int GetTypeInfoCount();
+               void GetTypeInfoOfGuid( ref Guid guid, out UCOMITypeInfo ppTInfo);
+               void GetTypeInfoType( int index, out TYPEKIND pTKind);
+               bool IsName( string szNameBuf, int lHashVal);
+               void ReleaseTLibAttr( IntPtr pTLibAttr);
        }
 }