diff options
Diffstat (limited to 'src/vm/comcache.cpp')
-rw-r--r-- | src/vm/comcache.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/vm/comcache.cpp b/src/vm/comcache.cpp index a1f2416c5c..ab2e53024d 100644 --- a/src/vm/comcache.cpp +++ b/src/vm/comcache.cpp @@ -91,11 +91,7 @@ static IErrorInfo *CheckForFuncEvalAbortNoThrow(HRESULT hr) else { // QI failed, put the IErrorInfo back - LeaveRuntimeHolderNoThrow lrh((size_t)SetErrorInfo); - if (SUCCEEDED(lrh.GetHR())) - { - SetErrorInfo(0, pErrorInfo); - } + SetErrorInfo(0, pErrorInfo); } } } @@ -1512,7 +1508,6 @@ HRESULT CtxEntry::EnterContext(PFNCTXCALLBACK pCallbackFunc, LPVOID pData) EX_TRY { - LeaveRuntimeHolder lrHolder(**(size_t**)(IContextCallback*)pCallback); hr = ((IContextCallback*)pCallback)->ContextCallback(EnterContextCallback, &callBackData, IID_IEnterActivityWithNoLock, 2, NULL); } EX_CATCH @@ -1531,13 +1526,7 @@ HRESULT CtxEntry::EnterContext(PFNCTXCALLBACK pCallbackFunc, LPVOID pData) LOG((LF_INTEROP, LL_INFO100, "Entering into context 0x08X has failed since the debugger is blocking it\n", m_pCtxCookie)); // put the IErrorInfo back - { - LeaveRuntimeHolderNoThrow lrh((size_t)SetErrorInfo); - if (SUCCEEDED(lrh.GetHR())) - { - SetErrorInfo(0, pErrorInfo); - } - } + SetErrorInfo(0, pErrorInfo); } else { |