Author: kazuki
Date: 2005-03-04 01:43:23 -0500 (Fri, 04 Mar 2005)
New Revision: 41426
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IBindCtx.cs
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumVARIANT.cs
trunk/mcs/class/corlib/System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs
trunk/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
trunk/mcs/class/corlib/System.Runtime.InteropServices/DefaultCharSetAttribute.cs
trunk/mcs/class/corlib/System.Runtime.InteropServices/ExposeAsClassToComAttribute.cs
Log:
2005-03-04 Kazuki Oikawa <[EMAIL PROTECTED]>
* IBindCtx.cs:
* IEnumVARIANT.cs:
* ComDefaultInterfaceAttribute.cs:
* CriticalHandle.cs:
* DefaultCharSetAttribute.cs:
* ExposeAsClassToComAttribute.cs: Fixed attributes.
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++
trunk/mcs/class/corlib/System.Runtime.InteropServices/ComDefaultInterfaceAttribute.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -11,7 +11,7 @@
namespace System.Runtime.InteropServices
{
- [AttributeUsage (AttributeTargets.Class)]
+ [AttributeUsage (AttributeTargets.Class, Inherited = false)]
public sealed class ComDefaultInterfaceAttribute : Attribute
{
Type _type;
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++ trunk/mcs/class/corlib/System.Runtime.InteropServices/CriticalHandle.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -23,6 +23,7 @@
handle = invalidHandleValue;
}
+ [ReliabilityContract (Consistency.WillNotCorruptState,
CER.Success)]
~CriticalHandle ()
{
Dispose ();
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices/DefaultCharSetAttribute.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.InteropServices/DefaultCharSetAttribute.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++
trunk/mcs/class/corlib/System.Runtime.InteropServices/DefaultCharSetAttribute.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -13,7 +13,7 @@
namespace System.Runtime.InteropServices
{
- [AttributeUsage (AttributeTargets.Module)]
+ [AttributeUsage (AttributeTargets.Module, Inherited = false)]
public class DefaultCharSetAttribute : Attribute
{
CharSet _set;
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices/ExposeAsClassToComAttribute.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.InteropServices/ExposeAsClassToComAttribute.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++
trunk/mcs/class/corlib/System.Runtime.InteropServices/ExposeAsClassToComAttribute.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -11,7 +11,7 @@
namespace System.Runtime.InteropServices
{
- [AttributeUsage (AttributeTargets.Struct)]
+ [AttributeUsage (AttributeTargets.Struct, Inherited = false)]
public class ExposeAsClassToComAttribute : Attribute
{
public ExposeAsClassToComAttribute ()
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IBindCtx.cs
===================================================================
--- trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IBindCtx.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++ trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IBindCtx.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -44,12 +44,11 @@
void SetBindOptions ([In] ref BIND_OPTS pbindopts);
void GetBindOptions (ref BIND_OPTS pbindopts);
void GetRunningObjectTable (out IRunningObjectTable pprot);
- [PreserveSig]
void RegisterObjectParam ([MarshalAs (UnmanagedType.LPWStr)]
string pszKey, [MarshalAs (UnmanagedType.Interface)] object punk);
void GetObjectParam ([MarshalAs (UnmanagedType.LPWStr)] string
pszKey, [MarshalAs (UnmanagedType.Interface)] out object ppunk);
void EnumObjectParam (out IEnumString ppenum);
[PreserveSig]
- void RevokeObjectParam ([MarshalAs(UnmanagedType.LPWStr)]
string pszKey);
+ int RevokeObjectParam ([MarshalAs(UnmanagedType.LPWStr)] string
pszKey);
}
}
#endif
Modified:
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumVARIANT.cs
===================================================================
---
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumVARIANT.cs
2005-03-04 05:41:14 UTC (rev 41425)
+++
trunk/mcs/class/corlib/System.Runtime.InteropServices.ComTypes/IEnumVARIANT.cs
2005-03-04 06:43:23 UTC (rev 41426)
@@ -39,7 +39,7 @@
public interface IEnumVARIANT
{
[PreserveSigAttribute]
- int Next (int celt, [Out] object[] rgvar, IntPtr pceltFetched);
+ int Next (int celt, [Out, MarshalAs (UnmanagedType.LPArray,
SizeParamIndex=0)] object[] rgvar, IntPtr pceltFetched);
[PreserveSigAttribute]
int Skip (int celt);
[PreserveSigAttribute]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
