Skip to content

Convert over StandardOleMarshalObject to use either source-generated or manual interop. #65226

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
jkoritzinsky merged 2 commits into from
Feb 12, 2022
Merged

Convert over StandardOleMarshalObject to use either source-generated or manual interop. #65226

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2881e8
Convert over StandardOleMarshalObject to use either source-generated …
jkoritzinsky Feb 11, 2022
0eefd62
Apply suggestions from code review
jkoritzinsky Feb 11, 2022
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
Prev Previous commit
Apply suggestions from code review 
Co-authored-by: Aaron Robinson <arobins@microsoft.com>
  • Loading branch information
@jkoritzinsky @AaronRobinsonMSFT
jkoritzinsky and AaronRobinsonMSFT authored Feb 11, 2022
commit 0eefd6261e5fc66478d7a90c322b81d6c8dfda5b
4 changes: 2 additions & 2 deletions ...em.Private.CoreLib/src/System/Runtime/InteropServices/StandardOleMarshalObject.Windows.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unsafe int IMarshal.GetMarshalSizeMax(ref Guid riid, IntPtr pv, int dwDestContex
fixed (Guid* riidPtr = &riid)
fixed (int* pSizePtr = &pSize)
{
// GetMarshalSizeMax is 4th slot
// GetMarshalSizeMax is 5th slot (zero-based indexing)
return ((delegate* unmanaged[Stdcall]<IntPtr, Guid*, IntPtr, int, IntPtr, int, int*, int>)(*(IntPtr**)pStandardMarshal)[4])(pStandardMarshal, riidPtr, pv, dwDestContext, pvDestContext, mshlflags, pSizePtr);
}
}
Expand All @@ -80,7 +80,7 @@ unsafe int IMarshal.MarshalInterface(IntPtr pStm, ref Guid riid, IntPtr pv, int
// risk triggering an AppVerifier break
fixed (Guid* riidPtr = &riid)
{
// MarshalInterface is 5th slot
// MarshalInterface is 6th slot (zero-based indexing)
return ((delegate* unmanaged[Stdcall]<IntPtr, IntPtr, Guid*, IntPtr, int, IntPtr, int, int>)(*(IntPtr**)pStandardMarshal)[5])(pStandardMarshal, pStm, riidPtr, pv, dwDestContext, pvDestContext, mshlflags);
}
}
Expand Down