Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Port COMException fix from master #15735

Merged
merged 1 commit into from
Jan 6, 2018
Merged

Port COMException fix from master #15735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vm/clrex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/vm/clrex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/vm/stubhelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down