From e8c4f5499136e137fdb3e3c5fb798b2637b21996 Mon Sep 17 00:00:00 2001 From: Faizur Rahman Date: Tue, 25 Oct 2016 17:29:16 -0700 Subject: [PATCH] Add Misc types to InteropServices Add the following types to InteropServices: - AutomationProxyAttribute - ComAliasNameAttribute - ComCompatibleVersionAttribute - ComConversionLossAttribute - ComRegisterFunctionAttribute - ComUnregisterFunctionAttribute - ICustomFactory - ICustomMarshaler - ImportedFromTypeLibAttribute - LCIDConversionAttribute - ManagedToNativeComInteropStubAttribute - PrimaryInteropAssemblyAttribute - ProgIdAttribute - TypeLibImportClassAttribute - TypeLibVersionAttribute --- src/mscorlib/model.xml | 85 +++++++++++++++++++++-- src/mscorlib/mscorlib.shared.sources.props | 2 +- src/mscorlib/ref/mscorlib.cs | 108 +++++++++++++++++++++++++++++ 3 files changed, 188 insertions(+), 7 deletions(-) diff --git a/src/mscorlib/model.xml b/src/mscorlib/model.xml index 63d048b..130702e 100644 --- a/src/mscorlib/model.xml +++ b/src/mscorlib/model.xml @@ -6555,7 +6555,6 @@ - @@ -6667,6 +6666,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6724,6 +6753,14 @@ + + + + + + + + @@ -6757,10 +6794,10 @@ - - - - + + + + @@ -6927,12 +6964,24 @@ + + + + + + + + + + + + @@ -6942,6 +6991,18 @@ + + + + + + + + + + + + @@ -6961,6 +7022,18 @@ + + + + + + + + + + + + @@ -9976,7 +10049,7 @@ - + diff --git a/src/mscorlib/mscorlib.shared.sources.props b/src/mscorlib/mscorlib.shared.sources.props index dcd4384..2bb41e3 100644 --- a/src/mscorlib/mscorlib.shared.sources.props +++ b/src/mscorlib/mscorlib.shared.sources.props @@ -123,7 +123,7 @@ - + diff --git a/src/mscorlib/ref/mscorlib.cs b/src/mscorlib/ref/mscorlib.cs index d379edf..27b0d30 100644 --- a/src/mscorlib/ref/mscorlib.cs +++ b/src/mscorlib/ref/mscorlib.cs @@ -10382,6 +10382,13 @@ namespace System.Runtime.InteropServices { public AllowReversePInvokeCallsAttribute() { } } + [System.AttributeUsageAttribute((System.AttributeTargets)(1029), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class AutomationProxyAttribute : System.Attribute + { + public AutomationProxyAttribute(bool val) { } + public bool Value { get { throw null; } } + } [System.Runtime.InteropServices.ComVisibleAttribute(true)] [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public partial struct ArrayWithOffset @@ -10454,6 +10461,29 @@ namespace System.Runtime.InteropServices public CoClassAttribute(System.Type coClass) { } public System.Type CoClass { get { throw null; } } } + [System.AttributeUsageAttribute((System.AttributeTargets)(10624), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ComAliasNameAttribute : System.Attribute + { + public ComAliasNameAttribute(String val) { } + public String Value { get { throw null; } } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(1), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ComCompatibleVersionAttribute : System.Attribute + { + public ComCompatibleVersionAttribute(System.Int32 major, System.Int32 minor, System.Int32 build, System.Int32 revision) { } + public System.Int32 MajorVersion { get { throw null; } } + public System.Int32 MinorVersion { get { throw null; } } + public System.Int32 BuildNumber { get { throw null;} } + public System.Int32 RevisionNumber { get { throw null; } } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(32767), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ComConversionLossAttribute : Attribute + { + public ComConversionLossAttribute() { } + } [System.AttributeUsageAttribute((System.AttributeTargets)(4), Inherited=false)] [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class ComDefaultInterfaceAttribute : System.Attribute @@ -10508,6 +10538,12 @@ namespace System.Runtime.InteropServices PropGet = 1, PropSet = 2, } + [System.AttributeUsageAttribute((System.AttributeTargets)(64), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ComRegisterFunctionAttribute : Attribute + { + public ComRegisterFunctionAttribute() { } + } [System.AttributeUsageAttribute((System.AttributeTargets)(4), Inherited=true)] [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class ComSourceInterfacesAttribute : System.Attribute @@ -10519,6 +10555,12 @@ namespace System.Runtime.InteropServices public ComSourceInterfacesAttribute(System.Type sourceInterface1, System.Type sourceInterface2, System.Type sourceInterface3, System.Type sourceInterface4) { } public string Value { get { throw null; } } } + [System.AttributeUsageAttribute((System.AttributeTargets)(64), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ComUnregisterFunctionAttribute : Attribute + { + public ComUnregisterFunctionAttribute() { } + } [System.AttributeUsageAttribute((System.AttributeTargets)(5597), Inherited=false)] [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class ComVisibleAttribute : System.Attribute @@ -10690,12 +10732,33 @@ namespace System.Runtime.InteropServices { object GetUnderlyingObject(); } + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public partial interface ICustomFactory + { + MarshalByRefObject CreateInstance(Type serverType); + } + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public partial interface ICustomMarshaler + { + object MarshalNativeToManaged(System.IntPtr pNativeData); + System.IntPtr MarshalManagedToNative(object ManagedObj); + void CleanUpNativeData(System.IntPtr pNativeData); + void CleanUpManagedData(object ManagedObj); + int GetNativeDataSize(); + } [System.Runtime.InteropServices.ComVisibleAttribute(false)] public partial interface ICustomQueryInterface { [System.Security.SecurityCriticalAttribute] System.Runtime.InteropServices.CustomQueryInterfaceResult GetInterface(ref System.Guid iid, out System.IntPtr ppv); } + [System.AttributeUsageAttribute((System.AttributeTargets)(1), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ImportedFromTypeLibAttribute : System.Attribute + { + public ImportedFromTypeLibAttribute(String val) { } + public String Value { get { throw null; } } + } [System.AttributeUsageAttribute((System.AttributeTargets)(2048), Inherited=false)] [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class InAttribute : System.Attribute @@ -10733,6 +10796,13 @@ namespace System.Runtime.InteropServices Explicit = 2, Sequential = 0, } + [System.AttributeUsageAttribute((System.AttributeTargets)(64), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class LCIDConversionAttribute : System.Attribute + { + public LCIDConversionAttribute(System.Int32 val) { } + public System.Int32 Value { get { throw null; } } + } [System.Security.SecurityCriticalAttribute] public static partial class Marshal { @@ -11020,6 +11090,14 @@ namespace System.Runtime.InteropServices [System.Security.SecurityCriticalAttribute] public static void ZeroFreeGlobalAllocUnicode(System.IntPtr s) { } } + [System.AttributeUsageAttribute((System.AttributeTargets)(64), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ManagedToNativeComInteropStubAttribute : System.Attribute + { + public ManagedToNativeComInteropStubAttribute(System.Type classType, System.String methodName) { } + public System.Type ClassType { get { throw null; } } + public System.String MethodName { get { throw null; } } + } [System.AttributeUsageAttribute((System.AttributeTargets)(10496), Inherited=false)] [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class MarshalAsAttribute : System.Attribute @@ -11072,6 +11150,21 @@ namespace System.Runtime.InteropServices { public PreserveSigAttribute() { } } + [System.AttributeUsageAttribute((System.AttributeTargets)(1), Inherited=false, AllowMultiple = true)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class PrimaryInteropAssemblyAttribute : System.Attribute + { + public PrimaryInteropAssemblyAttribute(System.Int32 major, System.Int32 minor) { } + public System.Int32 MajorVersion { get { throw null; } } + public System.Int32 MinorVersion { get { throw null; } } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(4), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class ProgIdAttribute : System.Attribute + { + public ProgIdAttribute(String val) { } + public String Value { get { throw null; } } + } [System.Runtime.InteropServices.ComVisibleAttribute(true)] public partial class SafeArrayRankMismatchException : System.SystemException { @@ -11166,6 +11259,21 @@ namespace System.Runtime.InteropServices public string Identifier { get { throw null; } } public string Scope { get { throw null; } } } + [System.AttributeUsageAttribute((System.AttributeTargets)(1024), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class TypeLibImportClassAttribute : System.Attribute + { + public TypeLibImportClassAttribute(System.Type val) { } + public String Value { get { throw null; } } + } + [System.AttributeUsageAttribute((System.AttributeTargets)(1), Inherited=false)] + [System.Runtime.InteropServices.ComVisibleAttribute(true)] + public sealed partial class TypeLibVersionAttribute : System.Attribute + { + public TypeLibVersionAttribute(System.Int32 major, System.Int32 minor) { } + public System.Int32 MajorVersion { get { throw null; } } + public System.Int32 MinorVersion { get { throw null; } } + } [System.Runtime.InteropServices.ComVisibleAttribute(true)] public sealed partial class UnknownWrapper { -- 2.7.4