Skip to content

[release/7.0] Fix Interop.Gdi32.StartDoc p/invoke #76582

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 1 commit into from
Oct 5, 2022
Merged

[release/7.0] Fix Interop.Gdi32.StartDoc p/invoke #76582

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
6 changes: 4 additions & 2 deletions src/libraries/System.Drawing.Common/src/Interop/Windows/Interop.Gdi32.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ internal static partial int StartDoc(
#if NET7_0_OR_GREATER
[MarshalUsing(typeof(HandleRefMarshaller))]
#endif
HandleRef hDC, DOCINFO lpDocInfo);
HandleRef hDC, in DOCINFO lpDocInfo);

[LibraryImport(Libraries.Gdi32, SetLastError = true)]
internal static partial int StartPage(
Expand Down Expand Up @@ -179,14 +179,16 @@ internal unsafe struct BITMAPINFO_FLAT
[NativeMarshalling(typeof(Marshaller))]
#endif
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
internal sealed class DOCINFO
internal struct DOCINFO
{
internal int cbSize = 20;
internal string? lpszDocName;
internal string? lpszOutput;
internal string? lpszDatatype;
internal int fwType;

public DOCINFO() { }

#if NET7_0_OR_GREATER
[CustomMarshaller(typeof(DOCINFO), MarshalMode.ManagedToUnmanagedIn, typeof(Marshaller))]
public static class Marshaller
Expand Down