Skip to content

Fix NativeAOT COM custom query interface exception handling #117691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2025
Merged

Fix NativeAOT COM custom query interface exception handling #117691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
919122a
Fix NativeAOT COM custom query interface exceptioon handling
janvorli Jul 15, 2025
9c09c9c
PR feedback
janvorli Jul 15, 2025
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
23 changes: 15 additions & 8 deletions src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/ComWrappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,15 +314,22 @@ public int QueryInterface(in Guid riid, out IntPtr ppvObject)
}
else
{
Guid riidLocal = riid;
switch (customQueryInterface.GetInterface(ref riidLocal, out ppvObject))
try
{
case CustomQueryInterfaceResult.Handled:
return HResults.S_OK;
case CustomQueryInterfaceResult.NotHandled:
break;
case CustomQueryInterfaceResult.Failed:
return HResults.COR_E_INVALIDCAST;
Guid riidLocal = riid;
switch (customQueryInterface.GetInterface(ref riidLocal, out ppvObject))
{
case CustomQueryInterfaceResult.Handled:
return HResults.S_OK;
case CustomQueryInterfaceResult.NotHandled:
break;
case CustomQueryInterfaceResult.Failed:
return HResults.COR_E_INVALIDCAST;
}
}
catch (Exception ex)
{
return Marshal.GetHRForException(ex);
}
}
}
Expand Down
Loading