From 03c7f4f63b224fed3a644a79a5f3c450852d4d96 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 2 Jun 2017 00:14:58 +0200 Subject: [PATCH] [corlib] Updates api --- .../EventListener.cs | 11 +++- .../CALLCONV.cs | 48 --------------- .../DISPPARAMS.cs | 44 -------------- .../ELEMDESC.cs | 50 ---------------- .../EXCEPINFO.cs | 53 ----------------- .../FUNCDESC.cs | 50 ---------------- .../FUNCFLAGS.cs | 53 ----------------- .../FUNCKIND.cs | 43 -------------- .../System.Runtime.InteropServices/IDLDESC.cs | 40 ------------- .../System.Runtime.InteropServices/IDLFLAG.cs | 45 -------------- .../IMPLTYPEFLAGS.cs | 44 -------------- .../INVOKEKIND.cs | 44 -------------- .../PARAMDESC.cs | 40 ------------- .../PARAMFLAG.cs | 49 ---------------- .../TYPEATTR.cs | 58 ------------------- .../TYPEDESC.cs | 40 ------------- .../System.Security.AccessControl/AceType.cs | 2 +- .../System.Security.Policy/PolicyException.cs | 2 +- mcs/class/corlib/corlib.dll.sources | 23 +------- .../runtime/interopservices/ucomitypeinfo.cs | 2 + 20 files changed, 14 insertions(+), 727 deletions(-) delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/CALLCONV.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/ELEMDESC.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/FUNCDESC.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/FUNCFLAGS.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/FUNCKIND.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/IDLDESC.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/IDLFLAG.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/IMPLTYPEFLAGS.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/PARAMDESC.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/PARAMFLAG.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/TYPEATTR.cs delete mode 100644 mcs/class/corlib/System.Runtime.InteropServices/TYPEDESC.cs diff --git a/mcs/class/corlib/System.Diagnostics.Tracing/EventListener.cs b/mcs/class/corlib/System.Diagnostics.Tracing/EventListener.cs index bc944350b30..f643b072359 100644 --- a/mcs/class/corlib/System.Diagnostics.Tracing/EventListener.cs +++ b/mcs/class/corlib/System.Diagnostics.Tracing/EventListener.cs @@ -30,12 +30,15 @@ using System.Collections.Generic; namespace System.Diagnostics.Tracing { - public abstract class EventListener : IDisposable + public class EventListener : IDisposable { - protected EventListener () + public EventListener () { } + //public event System.EventHandler EventSourceCreated; + //public event System.EventHandler EventWritten; + public static int EventSourceIndex(EventSource eventSource) { return 0; @@ -61,7 +64,9 @@ namespace System.Diagnostics.Tracing { } - protected internal abstract void OnEventWritten (EventWrittenEventArgs eventData); + protected internal virtual void OnEventWritten (EventWrittenEventArgs eventData) + { + } public virtual void Dispose() { diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CALLCONV.cs b/mcs/class/corlib/System.Runtime.InteropServices/CALLCONV.cs deleted file mode 100644 index d956b457a77..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/CALLCONV.cs +++ /dev/null @@ -1,48 +0,0 @@ -// -// System.Runtime.InteropServices.CALLCONV.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Serializable] - public enum CALLCONV - { - CC_CDECL = 1, - CC_PASCAL = 2, - CC_MSCPASCAL = 2, - CC_MACPASCAL = 3, - CC_STDCALL = 4, - CC_RESERVED = 5, - CC_SYSCALL = 6, - CC_MPWCDECL = 7, - CC_MPWPASCAL = 8, - CC_MAX = 9 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs b/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs deleted file mode 100644 index b038963d186..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs +++ /dev/null @@ -1,44 +0,0 @@ - -// -// Copyright (C) 2004 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. -// - -// System.Runtime.InteropServices/DISPPARAMS.cs -// -// Paolo Molaro (lupus@ximian.com) -// -// (C) 2002 Ximian, Inc. - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct DISPPARAMS { - public IntPtr rgvarg; - public IntPtr rgdispidNamedArgs; - public int cArgs; - public int cNamedArgs; - } -} - diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ELEMDESC.cs b/mcs/class/corlib/System.Runtime.InteropServices/ELEMDESC.cs deleted file mode 100644 index be58742bef1..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/ELEMDESC.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// System.Runtime.InteropServices.ELEMDESC.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct ELEMDESC - { - public TYPEDESC tdesc; - public DESCUNION desc; - - [ComVisible (false)] - [StructLayout (LayoutKind.Explicit, CharSet = CharSet.Unicode)] - public struct DESCUNION - { - [FieldOffset (0)] - public IDLDESC idldesc; - [FieldOffset (0)] - public PARAMDESC paramdesc; - } - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs deleted file mode 100644 index 0e61c36b7fd..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs +++ /dev/null @@ -1,53 +0,0 @@ - -// -// Copyright (C) 2004 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. -// - -// System.Runtime.InteropServices/EXCEPINFO.cs -// -// Paolo Molaro (lupus@ximian.com) -// -// (C) 2002 Ximian, Inc. - -using System; - -#if !FULL_AOT_RUNTIME -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct EXCEPINFO { - public short wCode; - public short wReserved; - [MarshalAs (UnmanagedType.BStr)] - public string bstrSource; - [MarshalAs (UnmanagedType.BStr)] - public string bstrDescription; - [MarshalAs (UnmanagedType.BStr)] - public string bstrHelpFile; - public int dwHelpContext; - public IntPtr pvReserved; - public IntPtr pfnDeferredFillIn; - } -} - -#endif diff --git a/mcs/class/corlib/System.Runtime.InteropServices/FUNCDESC.cs b/mcs/class/corlib/System.Runtime.InteropServices/FUNCDESC.cs deleted file mode 100644 index 30d251a4491..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/FUNCDESC.cs +++ /dev/null @@ -1,50 +0,0 @@ -// -// System.Runtime.InteropServices.FUNCDESC.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential)] - public struct FUNCDESC - { - public int memid; - public IntPtr lprgscode; - public IntPtr lprgelemdescParam; - public FUNCKIND funckind; - public INVOKEKIND invkind; - public CALLCONV callconv; - public short cParams; - public short cParamsOpt; - public short oVft; - public short cScodes; - public ELEMDESC elemdescFunc; - public short wFuncFlags; - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/FUNCFLAGS.cs b/mcs/class/corlib/System.Runtime.InteropServices/FUNCFLAGS.cs deleted file mode 100644 index 13d5da8266f..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/FUNCFLAGS.cs +++ /dev/null @@ -1,53 +0,0 @@ -// -// System.Runtime.InteropServices.FUNCFLAGS.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Flags, Serializable] - public enum FUNCFLAGS - { - FUNCFLAG_FRESTRICTED = 1, - FUNCFLAG_FSOURCE = 2, - FUNCFLAG_FBINDABLE = 4, - FUNCFLAG_FREQUESTEDIT = 8, - FUNCFLAG_FDISPLAYBIND = 16, - FUNCFLAG_FDEFAULTBIND = 32, - FUNCFLAG_FHIDDEN = 64, - FUNCFLAG_FUSESGETLASTERROR = 128, - FUNCFLAG_FDEFAULTCOLLELEM = 256, - FUNCFLAG_FUIDEFAULT = 512, - FUNCFLAG_FNONBROWSABLE = 1024, - FUNCFLAG_FREPLACEABLE = 2048, - FUNCFLAG_FIMMEDIATEBIND = 4096 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/FUNCKIND.cs b/mcs/class/corlib/System.Runtime.InteropServices/FUNCKIND.cs deleted file mode 100644 index eee7d3f0a1d..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/FUNCKIND.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -// System.Runtime.InteropServices.FUNCKIND.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Serializable] - public enum FUNCKIND - { - FUNC_VIRTUAL = 0, - FUNC_PUREVIRTUAL = 1, - FUNC_NONVIRTUAL = 2, - FUNC_STATIC = 3, - FUNC_DISPATCH = 4 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/IDLDESC.cs b/mcs/class/corlib/System.Runtime.InteropServices/IDLDESC.cs deleted file mode 100644 index dfa551828e5..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/IDLDESC.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -// System.Runtime.InteropServices.IDLDESC.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct IDLDESC - { - public int dwReserved; - public IDLFLAG wIDLFlags; - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/IDLFLAG.cs b/mcs/class/corlib/System.Runtime.InteropServices/IDLFLAG.cs deleted file mode 100644 index e29a1a8072a..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/IDLFLAG.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -// System.Runtime.InteropServices.IDLFLAG.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Flags, Serializable] - public enum IDLFLAG - { - IDLFLAG_NONE = 0, - IDLFLAG_FIN = 1, - IDLFLAG_FOUT = 2, - IDLFLAG_FLCID = 4, - IDLFLAG_FRETVAL = 8 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/IMPLTYPEFLAGS.cs b/mcs/class/corlib/System.Runtime.InteropServices/IMPLTYPEFLAGS.cs deleted file mode 100644 index 7da65a83851..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/IMPLTYPEFLAGS.cs +++ /dev/null @@ -1,44 +0,0 @@ -// -// System.Runtime.InteropServices.IMPLTYPEFLAGS.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Flags, Serializable] - public enum IMPLTYPEFLAGS - { - IMPLTYPEFLAG_FDEFAULT = 1, - IMPLTYPEFLAG_FSOURCE = 2, - IMPLTYPEFLAG_FRESTRICTED = 4, - IMPLTYPEFLAG_FDEFAULTVTABLE = 8 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs b/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs deleted file mode 100644 index 72c2edbeaa2..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs +++ /dev/null @@ -1,44 +0,0 @@ - -// -// Copyright (C) 2004 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. -// - -// System.Runtime.InteropServices/INVOKEKIND.cs -// -// Paolo Molaro (lupus@ximian.com) -// -// (C) 2002 Ximian, Inc. - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Serializable] - public enum INVOKEKIND { - INVOKE_FUNC = 1, - INVOKE_PROPERTYGET = 2, - INVOKE_PROPERTYPUT = 4, - INVOKE_PROPERTYPUTREF = 8 - } -} - diff --git a/mcs/class/corlib/System.Runtime.InteropServices/PARAMDESC.cs b/mcs/class/corlib/System.Runtime.InteropServices/PARAMDESC.cs deleted file mode 100644 index 82412040c64..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/PARAMDESC.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -// System.Runtime.InteropServices.PARAMDESC.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct PARAMDESC - { - public IntPtr lpVarValue; - public PARAMFLAG wParamFlags; - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/PARAMFLAG.cs b/mcs/class/corlib/System.Runtime.InteropServices/PARAMFLAG.cs deleted file mode 100644 index 5715c8f2fda..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/PARAMFLAG.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// System.Runtime.InteropServices.PARAMFLAG.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -using System; - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [Serializable] - [Flags] - public enum PARAMFLAG - { - PARAMFLAG_NONE = 0, - PARAMFLAG_FIN = 1, - PARAMFLAG_FOUT = 2, - PARAMFLAG_FLCID = 4, - PARAMFLAG_FRETVAL = 8, - PARAMFLAG_FOPT = 16, - PARAMFLAG_FHASDEFAULT = 32, - PARAMFLAG_FHASCUSTDATA = 64 - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TYPEATTR.cs b/mcs/class/corlib/System.Runtime.InteropServices/TYPEATTR.cs deleted file mode 100644 index 9b7bdd1b60d..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/TYPEATTR.cs +++ /dev/null @@ -1,58 +0,0 @@ -// -// System.Runtime.InteropServices.TYPEATTR.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct TYPEATTR - { - public const int MEMBER_ID_NIL = -1; - - public Guid guid; - public int lcid; - public int dwReserved; - public int memidConstructor; - public int memidDestructor; - public IntPtr lpstrSchema; - public int cbSizeInstance; - public TYPEKIND typekind; - public short cFuncs; - public short cVars; - public short cImplTypes; - public short cbSizeVft; - public short cbAlignment; - public TYPEFLAGS wTypeFlags; - public short wMajorVerNum; - public short wMinorVerNum; - public TYPEDESC tdescAlias; - public IDLDESC idldescType; - } -} diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TYPEDESC.cs b/mcs/class/corlib/System.Runtime.InteropServices/TYPEDESC.cs deleted file mode 100644 index 5dcf95c2022..00000000000 --- a/mcs/class/corlib/System.Runtime.InteropServices/TYPEDESC.cs +++ /dev/null @@ -1,40 +0,0 @@ -// -// System.Runtime.InteropServices.TYPEDESC.cs -// -// Author: -// Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// - -// -// Copyright (C) 2004 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. -// - -namespace System.Runtime.InteropServices -{ - [Obsolete] - [StructLayout (LayoutKind.Sequential, CharSet = CharSet.Unicode)] - public struct TYPEDESC - { - public IntPtr lpValue; - public short vt; - } -} diff --git a/mcs/class/corlib/System.Security.AccessControl/AceType.cs b/mcs/class/corlib/System.Security.AccessControl/AceType.cs index 32796ff7337..82d242a8e01 100644 --- a/mcs/class/corlib/System.Security.AccessControl/AceType.cs +++ b/mcs/class/corlib/System.Security.AccessControl/AceType.cs @@ -27,7 +27,7 @@ // namespace System.Security.AccessControl { - public enum AceType { + public enum AceType : byte { AccessAllowed = 0, AccessDenied = 1, SystemAudit = 2, diff --git a/mcs/class/corlib/System.Security.Policy/PolicyException.cs b/mcs/class/corlib/System.Security.Policy/PolicyException.cs index 022774c8049..1cbc404d2db 100644 --- a/mcs/class/corlib/System.Security.Policy/PolicyException.cs +++ b/mcs/class/corlib/System.Security.Policy/PolicyException.cs @@ -35,7 +35,7 @@ namespace System.Security.Policy { [Serializable] [ComVisible (true)] - public class PolicyException : SystemException, _Exception { + public class PolicyException : SystemException { // Constructors public PolicyException () : base (Locale.GetText ("Cannot run because of policy.")) diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources index c1a04aea0f3..9b245081069 100644 --- a/mcs/class/corlib/corlib.dll.sources +++ b/mcs/class/corlib/corlib.dll.sources @@ -257,7 +257,6 @@ System.Reflection/MonoProperty.cs System.Reflection/ParameterInfo.cs System.Reflection/PortableExecutableKinds.cs System.Reflection/PropertyInfo.cs -System.Reflection/ReflectionTypeLoadException.cs System.Reflection/StrongNameKeyPair.cs System.Reflection.Emit/AssemblyBuilder.cs System.Reflection.Emit/AssemblyBuilderAccess.cs @@ -362,24 +361,13 @@ System.Runtime.InteropServices/_Type.cs System.Runtime.InteropServices/_TypeBuilder.cs System.Runtime.InteropServices/BIND_OPTS.cs System.Runtime.InteropServices/BINDPTR.cs -System.Runtime.InteropServices/CALLCONV.cs System.Runtime.InteropServices/DESCKIND.cs -System.Runtime.InteropServices/DISPPARAMS.cs -System.Runtime.InteropServices/ELEMDESC.cs -System.Runtime.InteropServices/EXCEPINFO.cs System.Runtime.InteropServices/ExporterEventKind.cs System.Runtime.InteropServices/ExtensibleClassFactory.cs System.Runtime.InteropServices/FILETIME.cs -System.Runtime.InteropServices/FUNCDESC.cs -System.Runtime.InteropServices/FUNCFLAGS.cs -System.Runtime.InteropServices/FUNCKIND.cs System.Runtime.InteropServices/GCHandle.cs System.Runtime.InteropServices/GCHandleType.cs -System.Runtime.InteropServices/IDLDESC.cs -System.Runtime.InteropServices/IDLFLAG.cs System.Runtime.InteropServices/IErrorInfo.cs -System.Runtime.InteropServices/IMPLTYPEFLAGS.cs -System.Runtime.InteropServices/INVOKEKIND.cs System.Runtime.InteropServices/ITypeLibConverter.cs System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs @@ -389,8 +377,6 @@ System.Runtime.InteropServices/LIBFLAGS.cs System.Runtime.InteropServices/ManagedErrorInfo.cs System.Runtime.InteropServices/Marshal.cs System.Runtime.InteropServices/MarshalAsAttribute.cs -System.Runtime.InteropServices/PARAMDESC.cs -System.Runtime.InteropServices/PARAMFLAG.cs System.Runtime.InteropServices/RegistrationClassContext.cs System.Runtime.InteropServices/RegistrationConnectionType.cs System.Runtime.InteropServices/STATSTG.cs @@ -398,10 +384,6 @@ System.Runtime.InteropServices/RegistrationServices.cs System.Runtime.InteropServices/SafeBuffer.cs System.Runtime.InteropServices/SafeHandle.cs System.Runtime.InteropServices/SYSKIND.cs -System.Runtime.InteropServices/TYPEATTR.cs -System.Runtime.InteropServices/TYPEDESC.cs -System.Runtime.InteropServices/TYPEFLAGS.cs -System.Runtime.InteropServices/TYPEKIND.cs System.Runtime.InteropServices/TYPELIBATTR.cs System.Runtime.InteropServices/TypeLibConverter.cs System.Runtime.InteropServices/TypeLibExporterFlags.cs @@ -418,10 +400,7 @@ System.Runtime.InteropServices/UCOMIPersistFile.cs System.Runtime.InteropServices/UCOMIRunningObjectTable.cs System.Runtime.InteropServices/UCOMIStream.cs System.Runtime.InteropServices/UCOMITypeComp.cs -System.Runtime.InteropServices/UCOMITypeInfo.cs System.Runtime.InteropServices/UCOMITypeLib.cs -System.Runtime.InteropServices/VARDESC.cs -System.Runtime.InteropServices/VARFLAGS.cs System.Runtime.InteropServices/CustomQueryInterfaceMode.cs System.Runtime.InteropServices/ComEventsHelper.cs @@ -1233,6 +1212,7 @@ ReferenceSources/AppContextDefaultValues.cs ../referencesource/mscorlib/system/reflection/pointer.cs ../referencesource/mscorlib/system/reflection/propertyattributes.cs ../referencesource/mscorlib/system/reflection/reflectioncontext.cs +../referencesource/mscorlib/system/reflection/reflectiontypeloadexception.cs ../referencesource/mscorlib/system/reflection/resourceattributes.cs ../referencesource/mscorlib/system/reflection/RuntimeReflectionExtensions.cs ../referencesource/mscorlib/system/reflection/targetexception.cs @@ -1301,6 +1281,7 @@ ReferenceSources/AppContextDefaultValues.cs ../referencesource/mscorlib/system/runtime/interopservices/safearraytypemismatchexception.cs ../referencesource/mscorlib/system/runtime/interopservices/safehandle.cs ../referencesource/mscorlib/system/runtime/interopservices/sehexception.cs +../referencesource/mscorlib/system/runtime/interopservices/ucomitypeinfo.cs ../referencesource/mscorlib/system/runtime/interopservices/ucomienumconnections.cs ../referencesource/mscorlib/system/runtime/interopservices/unknownwrapper.cs ../referencesource/mscorlib/system/runtime/interopservices/variantWrapper.cs diff --git a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/ucomitypeinfo.cs b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/ucomitypeinfo.cs index 04a7b62e56d..2871edb13f4 100644 --- a/mcs/class/referencesource/mscorlib/system/runtime/interopservices/ucomitypeinfo.cs +++ b/mcs/class/referencesource/mscorlib/system/runtime/interopservices/ucomitypeinfo.cs @@ -303,6 +303,7 @@ namespace System.Runtime.InteropServices VARFLAG_FIMMEDIATEBIND =0x1000 } +#if !FULL_AOT_RUNTIME [Obsolete("Use System.Runtime.InteropServices.ComTypes.ITypeInfo instead. http://go.microsoft.com/fwlink/?linkid=14202", false)] [Guid("00020401-0000-0000-C000-000000000046")] [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] @@ -329,4 +330,5 @@ namespace System.Runtime.InteropServices void ReleaseFuncDesc(IntPtr pFuncDesc); void ReleaseVarDesc(IntPtr pVarDesc); } +#endif } -- 2.25.1