From: Raja R Harinath Date: Mon, 12 Mar 2007 13:31:45 +0000 (-0000) Subject: In corlib/System.Runtime.InteropServices: X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=3d693eeb90339833968d66c3dc9fde2fa3ba2cef;hp=a1ca5c7ec77bcaf51f84df5930208c827758bcb2;p=mono.git In corlib/System.Runtime.InteropServices: * DefaultParameterValueAttribute.cs: Move to System.dll. In System/System.Runtime.InteropServices: * StandardOleMarshalObject.cs: New .net2.0 class. * DefaultParameterValueAttribute.cs: Move here from corlib. svn path=/trunk/mcs/; revision=74124 --- diff --git a/mcs/class/System/System.Runtime.InteropServices/ChangeLog b/mcs/class/System/System.Runtime.InteropServices/ChangeLog new file mode 100644 index 00000000000..34d3aa5e635 --- /dev/null +++ b/mcs/class/System/System.Runtime.InteropServices/ChangeLog @@ -0,0 +1,5 @@ +2007-03-12 Raja R Harinath + + * StandardOleMarshalObject.cs: New .net2.0 class. + * DefaultParameterValueAttribute.cs: Move here from corlib. + diff --git a/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs b/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs new file mode 100644 index 00000000000..d1915a25a38 --- /dev/null +++ b/mcs/class/System/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs @@ -0,0 +1,55 @@ +// +// System.Runtime.InteropServices.DefaultParameterValueAttribute.cs +// +// Author: Zoltan Varga (vargaz@gmail.com) +// +// (C) Ximian, Inc. +// + +// +// Copyright (C) 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 +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 || BOOTSTRAP_NET_2_0 + +using System; + +namespace System.Runtime.InteropServices { + [AttributeUsage (AttributeTargets.Parameter)] + public sealed class DefaultParameterValueAttribute : Attribute + { + object value; + + public DefaultParameterValueAttribute (object value) + { + this.value = value; + } + + public object Value { + get { + return value; + } + } + } +} + +#endif diff --git a/mcs/class/System/System.Runtime.InteropServices/StandardOleMarshalObject.cs b/mcs/class/System/System.Runtime.InteropServices/StandardOleMarshalObject.cs new file mode 100644 index 00000000000..315a150c18f --- /dev/null +++ b/mcs/class/System/System.Runtime.InteropServices/StandardOleMarshalObject.cs @@ -0,0 +1,45 @@ +// +// System.Runtime.InteropServices.StandardOleMarshalObject.cs +// +// Author: Raja R Harinath +// + +// +// Copyright (C) 2007 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 +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +using System; + +namespace System.Runtime.InteropServices { + [ComVisible (true)] + [MonoLimitation ("The runtime does nothing special apart from what it already does with marshal-by-ref objects")] + public class StandardOleMarshalObject : MarshalByRefObject + { + protected StandardOleMarshalObject () + { + } + } +} + +#endif diff --git a/mcs/class/System/System.dll.sources b/mcs/class/System/System.dll.sources index 33fc8054ccf..fb92b437183 100644 --- a/mcs/class/System/System.dll.sources +++ b/mcs/class/System/System.dll.sources @@ -929,3 +929,5 @@ System.Net/UploadValuesCompletedEventArgs.cs System.Net/UploadValuesCompletedEventHandler.cs System.Net/UploadStringCompletedEventHandler.cs System.Net/DownloadStringCompletedEventHandler.cs +System.Runtime.InteropServices/DefaultParameterValueAttribute.cs +System.Runtime.InteropServices/StandardOleMarshalObject.cs diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog index b65dd4dd018..1d06fc7a16e 100644 --- a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog +++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog @@ -1,3 +1,7 @@ +2007-03-12 Raja R Harinath + + * DefaultParameterValueAttribute.cs: Move to System.dll. + 2007-02-08 Jonathan Chambers * Marshal.cs: Throw exceptions for AddRef, Release, diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs deleted file mode 100644 index 5f502aaaa09..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/DefaultParameterValueAttribute.cs +++ /dev/null @@ -1,55 +0,0 @@ -// -// System.Runtime.InteropServices.DefaultParameterValueAttribute.cs -// -// Author: Zoltan Varga (vargaz@gmail.com) -// -// (C) Ximian, Inc. -// - -// -// Copyright (C) 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 -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -#if NET_2_0 - -using System; - -namespace System.Runtime.InteropServices { - [AttributeUsage (AttributeTargets.Parameter)] - public sealed class DefaultParameterValueAttribute : Attribute - { - object value; - - public DefaultParameterValueAttribute (object value) - { - this.value = value; - } - - public object Value { - get { - return value; - } - } - } -} - -#endif diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index cc82a161257..bad4124136a 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -646,7 +646,6 @@ System.Runtime.InteropServices/CONNECTDATA.cs System.Runtime.InteropServices/CriticalHandle.cs System.Runtime.InteropServices/CurrencyWrapper.cs System.Runtime.InteropServices/DefaultCharSetAttribute.cs -System.Runtime.InteropServices/DefaultParameterValueAttribute.cs System.Runtime.InteropServices/DESCKIND.cs System.Runtime.InteropServices/DispatchWrapper.cs System.Runtime.InteropServices/DISPPARAMS.cs