diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-12 12:46:46 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-12 16:58:49 -0800 |
commit | c2ef095b02c2751f304f43d4c529a1fbac6079d2 (patch) | |
tree | fd82de19a28bda53c9d0ee97c45db39aa602495d /src/vm/interoputil.cpp | |
parent | c9a8100ddeaf106f61bd7837ff17ef2ecc069b0b (diff) | |
download | coreclr-c2ef095b02c2751f304f43d4c529a1fbac6079d2.tar.gz coreclr-c2ef095b02c2751f304f43d4c529a1fbac6079d2.tar.bz2 coreclr-c2ef095b02c2751f304f43d4c529a1fbac6079d2.zip |
Remove never defined FEATURE_COMINTEROP_TLB_SUPPORT and files that require it to be defined
Diffstat (limited to 'src/vm/interoputil.cpp')
-rw-r--r-- | src/vm/interoputil.cpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/src/vm/interoputil.cpp b/src/vm/interoputil.cpp index ffd54d004e..809704235e 100644 --- a/src/vm/interoputil.cpp +++ b/src/vm/interoputil.cpp @@ -46,9 +46,6 @@ #include "clrtocomcall.h" #include "comcache.h" #include "commtmemberinfomap.h" -#ifdef FEATURE_COMINTEROP_TLB_SUPPORT -#include "comtypelibconverter.h" -#endif #include "olevariant.h" #include "stdinterfaces.h" #include "notifyexternals.h" @@ -2355,48 +2352,7 @@ HRESULT LoadTypeLibExWithFlags(LPCOLESTR szFile, } CONTRACTL_END; -#ifndef FEATURE_COMINTEROP_TLB_SUPPORT return E_FAIL; -#else //FEATURE_COMINTEROP_TLB_SUPPORT - - *pptlib = NULL; - - GCX_PREEMP(); - - REGKIND rk = REGKIND_NONE; - - if ((flags & TlbExporter_ExportAs64Bit) == TlbExporter_ExportAs64Bit) - { - rk = (REGKIND)(REGKIND_NONE | LOAD_TLB_AS_64BIT); - } - else if ((flags & TlbExporter_ExportAs32Bit) == TlbExporter_ExportAs32Bit) - { - rk = (REGKIND)(REGKIND_NONE | LOAD_TLB_AS_32BIT); - } - - HRESULT hr = S_OK; - - EX_TRY - { - LeaveRuntimeHolder lrh((size_t)LoadTypeLibEx); - - hr = LoadTypeLibEx(szFile, rk, pptlib); - - // If we fail with E_INVALIDARG, it's probably because we're on a downlevel - // platform that doesn't support loading type libraries by bitness. - if (hr == E_INVALIDARG) - { - hr = LoadTypeLibEx(szFile, REGKIND_NONE, pptlib); - } - } - EX_CATCH - { - hr = E_OUTOFMEMORY; - } - EX_END_CATCH(SwallowAllExceptions); - - return hr; -#endif //FEATURE_COMINTEROP_TLB_SUPPORT } |