Address COM interop case involving legacy wCode usage.
#117596
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The wCode field in the EXCEPINFO is a 16-bit signed integer. This is a legacy field for 16-bit Windows, but is still used in many COM servers. The current implementation assumed it would result in an Exception using Marshal.GetExceptionForHR(), but converting a short to an int, will rarely result in a negative value which means null will almost always be returned. This change checks if the exception is null and if so, creates a simple COMException with the error code.
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug in COM interop exception handling where legacy 16-bit wCode values were not properly converted to exceptions. The issue occurred because converting a short to an int rarely produces negative values, causing Marshal.GetExceptionForHR() to return null instead of a proper exception.
- Adds null-checking logic to create a fallback
COMExceptionwhenMarshal.GetExceptionForHR()returns null - Updates method signatures and null checks to use modern C# nullable reference types and patterns
- Improves code documentation with detailed comments explaining the legacy
wCodebehavior
src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ExcepInfo.cs
Show resolved
Hide resolved
src/libraries/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/ComInterop/ExcepInfo.cs
Outdated
Show resolved
Hide resolved
|
Tagging subscribers to this area: @cston |
jkoritzinsky
approved these changes
Jul 14, 2025
ish-1313
pushed a commit
to ish-1313/runtime
that referenced
this pull request
Jul 14, 2025
This was referenced Jul 14, 2025
Open
elinor-fung
approved these changes
Jul 14, 2025
This was referenced Jul 14, 2025
|
/bg-a Android timeout |
|
/ba-g Android timeout |
|
/backport release/9.0-staging |
|
/backport to release/9.0-staging |
|
Started backporting to release/9.0-staging: https://github.com/dotnet/runtime/actions/runs/16283173445 |
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
wCodefield in theEXCEPINFOis a 16-bit signed integer. This is a legacy field for 16-bit Windows, but is still used in many COM servers. The current implementation assumed it would result in anExceptionusingMarshal.GetExceptionForHR(), but converting ashortto anint, will rarely result in a negative value which meansnullwill almost always be returned. This change checks if the exception isnulland if so, creates a simpleCOMExceptionwith the error code.Fixes #117568