Skip to content

Mark pvBuffer as In/Out #1247

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
RussKie merged 3 commits into from
Jul 1, 2019
Merged

Mark pvBuffer as In/Out #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74c982f
Mark pvBuffer as In/Out
MichalStrehovsky Jun 28, 2019
a2a76f3
Review feedback
MichalStrehovsky Jul 1, 2019
1ba5889
Review feedback
MichalStrehovsky Jul 1, 2019
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
9 changes: 4 additions & 5 deletions src/Common/src/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2007,12 +2007,11 @@ public PICTDESCemf(System.Drawing.Imaging.Metafile metafile)
}
}

[StructLayout(LayoutKind.Sequential)]
public class USEROBJECTFLAGS
public struct USEROBJECTFLAGS
{
public int fInherit = 0;
public int fReserved = 0;
public int dwFlags = 0;
public int fInherit;
public int fReserved;
public int dwFlags;
}

[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
Expand Down
2 changes: 1 addition & 1 deletion src/Common/src/UnsafeNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ public static bool TrySystemParametersInfoForDpi(int nAction, int nParam, [In, O
public static extern IntPtr GetProcessWindowStation();
[DllImport(ExternDll.User32, SetLastError = true)]

public static extern bool GetUserObjectInformation(HandleRef hObj, int nIndex, [MarshalAs(UnmanagedType.LPStruct)] NativeMethods.USEROBJECTFLAGS pvBuffer, int nLength, ref int lpnLengthNeeded);
public static extern bool GetUserObjectInformation(HandleRef hObj, int nIndex, ref NativeMethods.USEROBJECTFLAGS pvBuffer, int nLength, ref int lpnLengthNeeded);
[DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]

public static extern int ClientToScreen(HandleRef hWnd, [In, Out] NativeMethods.POINT pt);
Expand Down
4 changes: 2 additions & 2 deletions src/System.Windows.Forms/src/System/Windows/Forms/SystemInformation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ public static string ComputerName
/// Gets a value indicating whether the current process is running in user
/// interactive mode.
/// </summary>
public static bool UserInteractive
public unsafe static bool UserInteractive
{
get
{
Expand All @@ -807,7 +807,7 @@ public static bool UserInteractive
int lengthNeeded = 0;
NativeMethods.USEROBJECTFLAGS flags = new NativeMethods.USEROBJECTFLAGS();

if (UnsafeNativeMethods.GetUserObjectInformation(new HandleRef(null, hwinsta), NativeMethods.UOI_FLAGS, flags, Marshal.SizeOf(flags), ref lengthNeeded))
if (UnsafeNativeMethods.GetUserObjectInformation(new HandleRef(null, hwinsta), NativeMethods.UOI_FLAGS, ref flags, sizeof(NativeMethods.USEROBJECTFLAGS), ref lengthNeeded))
{
if ((flags.dwFlags & NativeMethods.WSF_VISIBLE) == 0)
{
Expand Down