diff options
author | Luqun Lou <luqunl@users.noreply.github.com> | 2018-03-27 14:20:09 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2018-03-27 14:20:09 -0700 |
commit | d0833f90ed516b08871635a05c1d5657379b8053 (patch) | |
tree | 58b7943d065d14a238564c1bde4f7f38f635569e /src/vm/interoputil.h | |
parent | bfa1881ab5b65175f97119b74ef127e08de882e1 (diff) | |
download | coreclr-d0833f90ed516b08871635a05c1d5657379b8053.tar.gz coreclr-d0833f90ed516b08871635a05c1d5657379b8053.tar.bz2 coreclr-d0833f90ed516b08871635a05c1d5657379b8053.zip |
Enable reflection load ComImport assembly and Type.IsComObjectType (#16943)
* Enable reflection load ComImport assembly and Type.IsComObjectType
* Update Enable reflection load ComImport assembly
Diffstat (limited to 'src/vm/interoputil.h')
-rw-r--r-- | src/vm/interoputil.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/vm/interoputil.h b/src/vm/interoputil.h index 6762c80f92..a6896248c6 100644 --- a/src/vm/interoputil.h +++ b/src/vm/interoputil.h @@ -106,6 +106,13 @@ ULONG SafeReleasePreemp(IUnknown* pUnk, RCW* pRCW = NULL); // Determines if a COM object can be cast to the specified type. BOOL CanCastComObject(OBJECTREF obj, MethodTable * pTargetMT); +// includes Types which hold a "ComObject" class +// and types which are imported through typelib +BOOL IsComWrapperClass(TypeHandle type); + +// includes Type which hold a "__ComObject" class +BOOL IsComObjectClass(TypeHandle type); + //--------------------------------------------------------- // Read the BestFit custom attribute info from // both assembly level and interface level @@ -491,14 +498,6 @@ public: static void ComputeGuidForGenericType(MethodTable *pMT, GUID *pGuid); }; // class WinRTGuidGenerator - -// includes Types which hold a "ComObject" class -// and types which are imported through typelib -BOOL IsComWrapperClass(TypeHandle type); - -// includes Type which hold a "__ComObject" class -BOOL IsComObjectClass(TypeHandle type); - IUnknown* MarshalObjectToInterface(OBJECTREF* ppObject, MethodTable* pItfMT, MethodTable* pClassMT, DWORD dwFlags); void UnmarshalObjectFromInterface(OBJECTREF *ppObjectDest, IUnknown **ppUnkSrc, MethodTable *pItfMT, MethodTable *pClassMT, DWORD dwFlags); @@ -508,7 +507,6 @@ class ICOMInterfaceMarshalerCallback; void GetNativeWinRTFactoryObject(MethodTable *pMT, Thread *pThread, MethodTable *pFactoryIntfMT, BOOL bNeedUniqueRCW, ICOMInterfaceMarshalerCallback *pCallback, OBJECTREF *prefFactory); #else // FEATURE_COMINTEROP - inline HRESULT EnsureComStartedNoThrow() { LIMITED_METHOD_CONTRACT; |