diff options
author | tijoytk <tijoytk@MUONNEUTRINO> | 2017-08-23 15:40:13 -0700 |
---|---|---|
committer | tijoytk <tijoytk@MUONNEUTRINO> | 2017-08-23 15:40:13 -0700 |
commit | 3d777c6b864dfdbde9db823ccdc27f087725f45c (patch) | |
tree | 2f87407eb015571673a1cf5717f367ad9f7f6283 | |
parent | 59da8574383d547a20dcae478b67ff458f6d71e6 (diff) | |
download | coreclr-3d777c6b864dfdbde9db823ccdc27f087725f45c.tar.gz coreclr-3d777c6b864dfdbde9db823ccdc27f087725f45c.tar.bz2 coreclr-3d777c6b864dfdbde9db823ccdc27f087725f45c.zip |
This reverts
https://github.com/dotnet/coreclr/commit/16fc3005c085212f6e700a0df8ff7f36c1ea535b
The PR was trying to fix an incorrect test , we should be passing
in !fForWinRT.See https://github.com/dotnet/coreclr/issues/13460#issuecomment-324456870
for more info.
-rw-r--r-- | src/vm/clrex.cpp | 2 | ||||
-rw-r--r-- | src/vm/clrex.h | 2 | ||||
-rw-r--r-- | src/vm/stubhelpers.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vm/clrex.cpp b/src/vm/clrex.cpp index ba040b7e81..3b21d649d6 100644 --- a/src/vm/clrex.cpp +++ b/src/vm/clrex.cpp @@ -1224,7 +1224,7 @@ OBJECTREF EEException::CreateThrowable() #endif } -RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode) +RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode /*= false*/) { LIMITED_METHOD_CONTRACT; diff --git a/src/vm/clrex.h b/src/vm/clrex.h index ce55ebcefa..12eb702be1 100644 --- a/src/vm/clrex.h +++ b/src/vm/clrex.h @@ -1095,7 +1095,7 @@ inline EEMessageException::EEMessageException(HRESULT hr) } inline EEMessageException::EEMessageException(HRESULT hr, bool fUseCOMException) - : EEException(GetKindFromHR(hr, fUseCOMException)), + : EEException(GetKindFromHR(hr, !fUseCOMException)), m_hr(hr), m_resID(0) { diff --git a/src/vm/stubhelpers.cpp b/src/vm/stubhelpers.cpp index 43250e5207..ead312d042 100644 --- a/src/vm/stubhelpers.cpp +++ b/src/vm/stubhelpers.cpp @@ -1690,7 +1690,7 @@ FCIMPL4(Object*, StubHelpers::GetCOMHRExceptionObject, HRESULT hr, MethodDesc *p } } - GetExceptionForHR(hr, pErrInfo, fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject); + GetExceptionForHR(hr, pErrInfo, !fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject); } HELPER_METHOD_FRAME_END(); |