Port COMException fix from master (#15735)

shrah · safern · commit b5c699697aec · 2018-01-05T18:44:53.000-06:00
diff --git 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
@@ -1096,7 +1096,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
@@ -1691,7 +1691,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();    
 

Original file line number	Diff line number	Diff line change
`@@ -1224,7 +1224,7 @@ OBJECTREF EEException::CreateThrowable()`
`1224`	`1224`	`#endif`
`1225`	`1225`	`}`
`1226`	`1226`
`1227`		`-RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode)`
	`1227`	`+RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode /= false/)`
`1228`	`1228`	`{`
`1229`	`1229`	`LIMITED_METHOD_CONTRACT;`
`1230`	`1230`
Original file line number	Diff line number	Diff line change
`@@ -1096,7 +1096,7 @@ inline EEMessageException::EEMessageException(HRESULT hr)`
`1096`	`1096`	`}`
`1097`	`1097`
`1098`	`1098`	`inline EEMessageException::EEMessageException(HRESULT hr, bool fUseCOMException)`
`1099`		`- : EEException(GetKindFromHR(hr, fUseCOMException)),`
	`1099`	`+ : EEException(GetKindFromHR(hr, !fUseCOMException)),`
`1100`	`1100`	`m_hr(hr),`
`1101`	`1101`	`m_resID(0)`
`1102`	`1102`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1691,7 +1691,7 @@ FCIMPL4(Object, StubHelpers::GetCOMHRExceptionObject, HRESULT hr, MethodDesc p`
`1691`	`1691`	`}`
`1692`	`1692`	`}`
`1693`	`1693`
`1694`		`- GetExceptionForHR(hr, pErrInfo, fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject);`
	`1694`	`+ GetExceptionForHR(hr, pErrInfo, !fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject);`
`1695`	`1695`	`}`
`1696`	`1696`	`HELPER_METHOD_FRAME_END();`
`1697`	`1697`