Skip to content

Updating QueryInterface API calls #10107

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
dreddy-work merged 1 commit into from
Oct 12, 2023
Merged

Updating QueryInterface API calls #10107

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
13 changes: 0 additions & 13 deletions src/System.Drawing.Common/src/System/Drawing/DrawingCom.ComWrappers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,7 @@ protected override object CreateObject(IntPtr externalComObject, CreateObjectFla
Debug.Assert(flags == CreateObjectFlags.UniqueInstance);

Guid pictureIID = IPicture.IID;
#if NET8_0_OR_GREATER
int hr = Marshal.QueryInterface(externalComObject, in pictureIID, out IntPtr comObject);
#else
int hr = Marshal.QueryInterface(externalComObject, ref pictureIID, out IntPtr comObject);
#endif
if (hr == S_OK)
{
return new PictureWrapper(comObject);
Expand All @@ -78,12 +74,7 @@ internal static IStreamWrapper GetComWrapper(Ole32.IStream stream)
IntPtr streamWrapperPtr = Instance.GetOrCreateComInterfaceForObject(stream, CreateComInterfaceFlags.None);

Guid streamIID = IID_IStream;

#if NET8_0_OR_GREATER
int hr = Marshal.QueryInterface(streamWrapperPtr, in streamIID, out IntPtr streamPtr);
#else
int hr = Marshal.QueryInterface(streamWrapperPtr, ref streamIID, out IntPtr streamPtr);
#endif

Marshal.Release(streamWrapperPtr);

Expand Down Expand Up @@ -321,11 +312,7 @@ public unsafe int SaveAsFile(IntPtr pstm, int fSaveMemCopy, int* pcbSize)
// Get the IStream implementation, since the ComWrappers runtime returns a pointer to the IUnknown interface implementation
Guid streamIID = IID_IStream;

#if NET8_0_OR_GREATER
ThrowExceptionForHR(Marshal.QueryInterface(pstm, in streamIID, out IntPtr pstmImpl));
#else
ThrowExceptionForHR(Marshal.QueryInterface(pstm, ref streamIID, out IntPtr pstmImpl));
#endif

try
{
Expand Down