Removed UnmanagedType_80 that was required because mcs bug #75945 was not discovered.

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

diff --git a/mcs/build/common/ChangeLog b/mcs/build/common/ChangeLog
index ebca194f7531ab7f738c5c43de7321857bf3187e..52ca4e45f91861af2d1583f049dfb56229e7830b 100644 (file)
--- a/mcs/build/common/ChangeLog
+++ b/mcs/build/common/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-21  Kornél Pál  <kornelpal@hotmail.com>\r
+\r
+       * Consts.cs.in: Removed UnmanagedType_80 that was required because mcs bug\r
+         #75945 was not discovered.\r
+\r
 2005-08-26  Kornél Pál  <kornelpal@hotmail.com>\r
 \r
        * Consts.cs.in: Use Microsoft.VisualStudio.Web only in profile NET_2_0 as\r

diff --git a/mcs/build/common/Consts.cs.in b/mcs/build/common/Consts.cs.in
index 56f0ecf3acd6d1e6ad8f2cd36f6d9e925c7b07e6..822c1ab16bb37459ca8b1e9aba91378247e8b9c3 100644 (file)
--- a/mcs/build/common/Consts.cs.in
+++ b/mcs/build/common/Consts.cs.in
@@ -60,7 +60,7 @@ internal
        public const string FxVersion = "1.0.3300.0";\r
        public const string VsVersion = "7.0.3300.0";\r
 #else\r
-#error No profile symbols specified.\r
+#error No profile symbols defined.\r
 #endif\r
 \r
        //\r
@@ -87,12 +87,4 @@ internal
        public const string AssemblySystem_ServiceProcess = "System.ServiceProcess, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";\r
        public const string AssemblySystem_Web = "System.Web, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
        public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
-\r
-#if INSIDE_CORLIB\r
-#if BOOTSTRAP_WITH_OLDLIB\r
-       public const UnmanagedType UnmanagedType_80 = UnmanagedType.mono_bootstrap_NativeTypeMax;\r
-#else\r
-       public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80;\r
-#endif\r
-#endif\r
 }\r

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ChangeLog
index 564642b75383b926be604483db2da3861784f77c..a2f0e633b1584d0147253af7d9787d5275f8864b 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Kornél Pál  <kornelpal@hotmail.com>
+
+       * IEnumConnections.cs, IEnumMoniker.cs, IEnumString.cs, IStream.cs,
+         ITypeInfo.cs, ITypeLib.cs:
+         Removed UnmanagedType_80 that was required because mcs bug #75945
+         was not discovered.
+
 2005-03-04  Kazuki Oikawa  <kazuki@panicode.com>
 
        * IBindCtx.cs

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumConnections.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumConnections.cs
index b4821ce7999fdb85d8dbb3f1cd04e4075ab22d00..6938abe34067a1b583ac5efad2289e39654fc88e 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumConnections.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumConnections.cs
@@ -39,7 +39,7 @@ namespace System.Runtime.InteropServices.ComTypes
        public interface IEnumConnections
        {
                [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType=Consts.UnmanagedType_80, SizeParamIndex=0)] CONNECTDATA[] rgelt, IntPtr pceltFetched);
+               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex=0)] CONNECTDATA[] rgelt, IntPtr pceltFetched);
                [PreserveSigAttribute]
                int Skip (int celt);
                void Reset ();

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumMoniker.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumMoniker.cs
index bc75f24e460c4111a1ed78e3b989a188305e1285..578b68fe13d4696005af8ee7e8b48e253814e239 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumMoniker.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumMoniker.cs
@@ -39,7 +39,7 @@ namespace System.Runtime.InteropServices.ComTypes
        public interface IEnumMoniker
        {
                [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 0)] IMoniker[] rgelt, IntPtr pceltFetched);
+               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IMoniker[] rgelt, IntPtr pceltFetched);
                [PreserveSigAttribute]
                int Skip (int celt);
                void Reset ();

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumString.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumString.cs
index 7ee1c4e9881c5b238360db801770ba08827816f0..cd68c272559e6d31275488354f0f68cb14bccc90 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumString.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumString.cs
@@ -39,7 +39,7 @@ namespace System.Runtime.InteropServices.ComTypes
        public interface IEnumString
        {
                [PreserveSigAttribute]
-               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 0)] string[] rgelt, IntPtr pceltFetched);
+               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex = 0)] string[] rgelt, IntPtr pceltFetched);
                [PreserveSigAttribute]
                int Skip (int celt);
                void Reset ();

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IStream.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IStream.cs
index a0eaa187c66fdfc123e983bd33faa809dfac67a8..fff931ddeb9374f26371666ed2287b3779336137 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IStream.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IStream.cs
@@ -39,8 +39,8 @@ namespace System.Runtime.InteropServices.ComTypes
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        public interface IStream
        {
-               void Read ([Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
-               void Write ([MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
+               void Read ([Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
+               void Write ([MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
                void Seek (long dlibMove, int dwOrigin, IntPtr plibNewPosition);
                void SetSize (long libNewSize);
                void CopyTo (IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeInfo.cs
index d3dfd1a0d01da0fe5e584429fc4c4a3737125cee..8b56645a2b66ce9e4c436fe5cb36ecdf8df94124 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeInfo.cs
@@ -41,10 +41,10 @@ namespace System.Runtime.InteropServices.ComTypes
                void GetTypeComp (out ITypeComp ppTComp);
                void GetFuncDesc (int index, out IntPtr ppFuncDesc);
                void GetVarDesc (int index, out IntPtr ppVarDesc);
-               void GetNames (int memid, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex=2)] string[] rgBstrNames, int cMaxNames, out int pcNames);
+               void GetNames (int memid, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex=2)] string[] rgBstrNames, int cMaxNames, out int pcNames);
                void GetRefTypeOfImplType (int index, out int href);
                void GetImplTypeFlags (int index, out IMPLTYPEFLAGS pImplTypeFlags);
-               void GetIDsOfNames ([In, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType.LPWStr), SizeParamIndex=1)] string[] rgszNames, int cNames, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex=1)] int[] pMemId);
+               void GetIDsOfNames ([In, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType.LPWStr), SizeParamIndex=1)] string[] rgszNames, int cNames, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex=1)] int[] pMemId);
                void Invoke ([MarshalAs (UnmanagedType.IUnknown)] object pvInstance, int memid, short wFlags, ref DISPPARAMS pDispParams, IntPtr pVarResult, IntPtr pExcepInfo, out int puArgErr);
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                void GetDllEntry (int memid, INVOKEKIND invKind, IntPtr pBstrDllName, IntPtr pBstrName, IntPtr pwOrdinal);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeLib.cs
index da3b0651c20b3c5fb364c5b124351ec75e5be1b6..fb0d90720ce9fc3d215ea79919b6910684c29e0d 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeLib.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/ITypeLib.cs
@@ -48,7 +48,7 @@ namespace System.Runtime.InteropServices.ComTypes
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                [return: MarshalAs (UnmanagedType.Bool)]
                bool IsName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal);
-               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] ITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] int[] rgMemId, ref short pcFound);
+               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray)] ITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray)] int[] rgMemId, ref short pcFound);
                [PreserveSig]
                void ReleaseTLibAttr (IntPtr pTLibAttr);
        }

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
index 3439a1860623ccd2291e3dcfbb54845b1ab38415..3f07c4ae7ff5e05ac6bd2a9de604fc4634f3272d 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-21  Kornél Pál  <kornelpal@hotmail.com>
+
+       * UCOMIEnumConnections.cs, UCOMIEnumMoniker.cs, UCOMIEnumString.cs,
+         UCOMIStream.cs, UCOMITypeInfo.cs, UCOMITypeLib.cs, UnmanagedType.cs:
+         Removed UnmanagedType_80 that was required because mcs bug #75945
+         was not discovered.
+
 2005-08-12  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * SetWin32ContextInIDispatchAttribute.cs: Make this attribute also

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
index c071d3381a7483eacbe6653a317b51a6aa038b76..8981d157ea118f8f5125acb695e33cce7defb3c2 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnections.cs
@@ -43,7 +43,7 @@ namespace System.Runtime.InteropServices
 #if NET_2_0
                [PreserveSig]
 #endif
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType=Consts.UnmanagedType_80, SizeParamIndex=0)] CONNECTDATA[] rgelt, out int pceltFetched);
+               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex=0)] CONNECTDATA[] rgelt, out int pceltFetched);
 #if NET_2_0
                [PreserveSig]
 #endif

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
index 4e002cdba1ea7052fb3a531ac48427376e16f519..d54f3b8264b2559a770baf3142e39fac5f2fc46f 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumMoniker.cs
@@ -43,7 +43,7 @@ namespace System.Runtime.InteropServices
 #if NET_2_0
                [PreserveSig]
 #endif
-               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 0)] UCOMIMoniker[] rgelt, out int pceltFetched);
+               int Next (int celt, [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] UCOMIMoniker[] rgelt, out int pceltFetched);
 #if NET_2_0
                [PreserveSig]
 #endif

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
index 675059065236ddca25a7dfaa9bc04504ff4ca56f..967c016f29804e8526687b644d4eb31829b1ace2 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumString.cs
@@ -43,7 +43,7 @@ namespace System.Runtime.InteropServices
 #if NET_2_0
                [PreserveSig]
 #endif
-               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 0)] string[] rgelt, out int pceltFetched);
+               int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex = 0)] string[] rgelt, out int pceltFetched);
 #if NET_2_0
                [PreserveSig]
 #endif

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
index a79d6699d5ff11ae2dcf5776ca9566541b3553c1..af69e805f2f4087398508b06e8844d0ff55efdbf 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIStream.cs
@@ -41,8 +41,8 @@ namespace System.Runtime.InteropServices
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMIStream
        {
-               void Read ([Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
-               void Write ([MarshalAs(UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
+               void Read ([Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
+               void Write ([MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
                void Seek (long dlibMove, int dwOrigin, IntPtr plibNewPosition);
                void SetSize (long libNewSize);
                void CopyTo (UCOMIStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
index 8b2603c7c51dd49baee9a795c6a4dbca2bcf610a..ad467ef39890412bbd9d9a5e2ba48d5e6c0b87fb 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
@@ -43,10 +43,10 @@ namespace System.Runtime.InteropServices
                void GetTypeComp (out UCOMITypeComp ppTComp);
                void GetFuncDesc (int index, out IntPtr ppFuncDesc);
                void GetVarDesc (int index, out IntPtr ppVarDesc);
-               void GetNames (int memid, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex=2)] string[] rgBstrNames, int cMaxNames, out int pcNames);
+               void GetNames (int memid, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex=2)] string[] rgBstrNames, int cMaxNames, out int pcNames);
                void GetRefTypeOfImplType (int index, out int href);
                void GetImplTypeFlags (int index, out int pImplTypeFlags);
-               void GetIDsOfNames ([In, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType.LPWStr), SizeParamIndex=1)] string[] rgszNames, int cNames, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80, SizeParamIndex=1)] int[] pMemId);
+               void GetIDsOfNames ([In, MarshalAs(UnmanagedType.LPArray, ArraySubType = (UnmanagedType.LPWStr), SizeParamIndex=1)] string[] rgszNames, int cNames, [Out, MarshalAs (UnmanagedType.LPArray, SizeParamIndex=1)] int[] pMemId);
                void Invoke ([MarshalAs (UnmanagedType.IUnknown)] object pvInstance, int memid, short wFlags, ref DISPPARAMS pDispParams, out object pVarResult, out EXCEPINFO pExcepInfo, out int puArgErr);
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                void GetDllEntry (int memid, INVOKEKIND invKind, out string pBstrDllName, out string pBstrName, out short pwOrdinal);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
index 6a637f0acc1dcf14fa82a9b825ef79ad5ba0f073..af1aa6ada5ddec5e193b97cb37a11a6e9b7c7890 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
@@ -52,7 +52,7 @@ namespace System.Runtime.InteropServices
                void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
                [return: MarshalAs (UnmanagedType.Bool)]
                bool IsName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal);
-               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] UCOMITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray, ArraySubType = Consts.UnmanagedType_80)] int[] rgMemId, ref short pcFound);
+               void FindName ([MarshalAs(UnmanagedType.LPWStr)] string szNameBuf, int lHashVal, [Out, MarshalAs (UnmanagedType.LPArray)] UCOMITypeInfo[] ppTInfo, [Out, MarshalAs (UnmanagedType.LPArray)] int[] rgMemId, ref short pcFound);
 #if NET_2_0
                [PreserveSig]
 #endif

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
index aa90306c139c76c77aa7faf78e3b2200e49313f3..7402275e8144aae9f7507f56497d0a5b16ad23b9 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
@@ -183,13 +183,7 @@ namespace System.Runtime.InteropServices {
 
                /// <summary>
                /// </summary>
-               Error = 45,
-
-#if BOOTSTRAP_WITH_OLDLIB
-               /// <summary>
-               /// </summary>
-               mono_bootstrap_NativeTypeMax = 80,
-#endif
+               Error = 45
        } // UnmanagedType
 
 } // System.Runtime.InteropServices