ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-13 18:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win] Do not overload internal SetWindowLong

Browse source 
The internal function is now appended with "Internal".
This commit is contained in:
Stefanos A. 2014-01-08 19:22:03 +01:00
parent 7363cfee7b
commit 51ad513dbb
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Source/OpenTK/Platform/Windows/API.cs
View file

@ -151,7 +151,12 @@ namespace OpenTK.Platform.Windows
internal static extern BOOL AdjustWindowRect([In, Out] ref Win32Rectangle lpRect, WindowStyle dwStyle, BOOL bMenu); internal static extern BOOL AdjustWindowRect([In, Out] ref Win32Rectangle lpRect, WindowStyle dwStyle, BOOL bMenu);
[DllImport("user32.dll", EntryPoint = "AdjustWindowRectEx", CallingConvention = CallingConvention.StdCall, SetLastError = true), SuppressUnmanagedCodeSecurity] [DllImport("user32.dll", EntryPoint = "AdjustWindowRectEx", CallingConvention = CallingConvention.StdCall, SetLastError = true), SuppressUnmanagedCodeSecurity]
internal static extern bool AdjustWindowRectEx(ref Win32Rectangle lpRect, WindowStyle dwStyle, bool bMenu, ExtendedWindowStyle dwExStyle); [return: MarshalAs(UnmanagedType.Bool)]
internal static extern bool AdjustWindowRectEx(
ref Win32Rectangle lpRect,
WindowStyle dwStyle,
[MarshalAs(UnmanagedType.Bool)] bool bMenu,
ExtendedWindowStyle dwExStyle);
#endregion #endregion
@ -262,9 +267,9 @@ namespace OpenTK.Platform.Windows
SetLastError(0); SetLastError(0);
if (IntPtr.Size == 4) if (IntPtr.Size == 4)
retval = new IntPtr(SetWindowLong(handle, item, newValue.ToInt32())); retval = new IntPtr(SetWindowLongInternal(handle, item, newValue.ToInt32()));
else else
retval = SetWindowLongPtr(handle, item, newValue); retval = SetWindowLongPtrInternal(handle, item, newValue);
if (retval == IntPtr.Zero) if (retval == IntPtr.Zero)
{ {
@ -282,21 +287,21 @@ namespace OpenTK.Platform.Windows
} }
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLong")]
static extern LONG SetWindowLong(HWND hWnd, GetWindowLongOffsets nIndex, LONG dwNewLong); static extern LONG SetWindowLongInternal(HWND hWnd, GetWindowLongOffsets nIndex, LONG dwNewLong);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLongPtr")]
static extern LONG_PTR SetWindowLongPtr(HWND hWnd, GetWindowLongOffsets nIndex, LONG_PTR dwNewLong); static extern LONG_PTR SetWindowLongPtrInternal(HWND hWnd, GetWindowLongOffsets nIndex, LONG_PTR dwNewLong);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLong")]
static extern LONG SetWindowLong(HWND hWnd, GetWindowLongOffsets nIndex, static extern LONG SetWindowLongInternal(HWND hWnd, GetWindowLongOffsets nIndex,
[MarshalAs(UnmanagedType.FunctionPtr)]WindowProcedure dwNewLong); [MarshalAs(UnmanagedType.FunctionPtr)]WindowProcedure dwNewLong);
[SuppressUnmanagedCodeSecurity] [SuppressUnmanagedCodeSecurity]
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true, EntryPoint = "SetWindowLongPtr")]
static extern LONG_PTR SetWindowLongPtr(HWND hWnd, GetWindowLongOffsets nIndex, static extern LONG_PTR SetWindowLongPtrInternal(HWND hWnd, GetWindowLongOffsets nIndex,
[MarshalAs(UnmanagedType.FunctionPtr)]WindowProcedure dwNewLong); [MarshalAs(UnmanagedType.FunctionPtr)]WindowProcedure dwNewLong);
#endregion #endregion