From 1aa57ef746484e7f1e245e9cc9dfcc557ad76dfb Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 27 Feb 2015 13:02:35 +0100 Subject: [corlib] Add DefaultDllImportSearchPathsAttribute --- .../DefaultDllImportSearchPathsAttribute.cs | 42 ++++++++++++++++++++++ .../DllImportSearchPath.cs | 42 ++++++++++++++++++++++ mcs/class/corlib/corlib.dll.sources | 2 ++ 3 files changed, 86 insertions(+) create mode 100644 mcs/class/corlib/System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs create mode 100644 mcs/class/corlib/System.Runtime.InteropServices/DllImportSearchPath.cs diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs new file mode 100644 index 00000000000..863a1f0fedb --- /dev/null +++ b/mcs/class/corlib/System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs @@ -0,0 +1,42 @@ +// +// DefaultDllImportSearchPathsAttribute.cs +// +// Authors: +// Marek Safar +// +// Copyright (C) 2015 Xamarin Inc (http://www.xamarin.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. +// + +namespace System.Runtime.InteropServices +{ + [AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Method, AllowMultiple = false)] + [System.Runtime.InteropServices.ComVisible (false)] + public sealed class DefaultDllImportSearchPathsAttribute : Attribute + { + public DefaultDllImportSearchPathsAttribute(DllImportSearchPath paths) + { + Paths = paths; + } + + public DllImportSearchPath Paths { get; private set; } + } +} \ No newline at end of file diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DllImportSearchPath.cs b/mcs/class/corlib/System.Runtime.InteropServices/DllImportSearchPath.cs new file mode 100644 index 00000000000..9bfa505cebf --- /dev/null +++ b/mcs/class/corlib/System.Runtime.InteropServices/DllImportSearchPath.cs @@ -0,0 +1,42 @@ +// +// DllImportSearchPath.cs +// +// Authors: +// Marek Safar +// +// Copyright (C) 2015 Xamarin Inc (http://www.xamarin.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. +// + +namespace System.Runtime.InteropServices +{ + [Flags] + public enum DllImportSearchPath + { + UseDllDirectoryForDependencies = 0x100, + ApplicationDirectory = 0x200, + UserDirectories = 0x400, + System32 = 0x800, + SafeDirectories = 0x1000, + AssemblyDirectory = 0x2, + LegacyBehavior = 0x0 + } +} \ No newline at end of file diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index 4b26ebaca5b..768856c724c 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -607,6 +607,8 @@ System.Runtime.InteropServices/CONNECTDATA.cs System.Runtime.InteropServices/CriticalHandle.cs System.Runtime.InteropServices/CurrencyWrapper.cs System.Runtime.InteropServices/DefaultCharSetAttribute.cs +System.Runtime.InteropServices/DllImportSearchPath.cs +System.Runtime.InteropServices/DefaultDllImportSearchPathsAttribute.cs System.Runtime.InteropServices/DESCKIND.cs System.Runtime.InteropServices/DispatchWrapper.cs System.Runtime.InteropServices/DISPPARAMS.cs -- cgit v1.2.3