diff options
| author | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
|---|---|---|
| committer | danmosemsft <danmose@microsoft.com> | 2017-02-11 07:20:12 -0800 |
| commit | 56d4ba8a9338c3ff7378d18378f38ad847f130f2 (patch) | |
| tree | 40b9463880286b1bc0b4c3f858680f1ff210c933 /src/vm/interoputil.cpp | |
| parent | 8be2f9bb0039e2c49f59c4fb66cebf5467485ba2 (diff) | |
| download | coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.gz coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.tar.bz2 coreclr-56d4ba8a9338c3ff7378d18378f38ad847f130f2.zip | |
Revert "Remove always defined FEATURE_CORESYSTEM"
This reverts commit 751771a8976f909af772e35c167bd7e3ffbe44c8.
Diffstat (limited to 'src/vm/interoputil.cpp')
| -rw-r--r-- | src/vm/interoputil.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/vm/interoputil.cpp b/src/vm/interoputil.cpp index f4dc236b80..ffd54d004e 100644 --- a/src/vm/interoputil.cpp +++ b/src/vm/interoputil.cpp @@ -2520,12 +2520,20 @@ HRESULT GetCLSIDFromProgID(__in_z WCHAR *strProgId, GUID *pGuid) HRESULT hr = S_OK; +#ifdef FEATURE_CORESYSTEM LeaveRuntimeHolderNoThrow lrh((size_t)CLSIDFromProgID); +#else + LeaveRuntimeHolderNoThrow lrh((size_t)CLSIDFromProgIDEx); +#endif hr = lrh.GetHR(); if (FAILED(hr)) return hr; +#ifdef FEATURE_CORESYSTEM return CLSIDFromProgID(strProgId, pGuid); +#else + return CLSIDFromProgIDEx(strProgId, pGuid); +#endif } #endif // FEATURE_CLASSIC_COMINTEROP |