- Changing DllImport EntryPoint name for SetWindowLongPtr64 from nameof(SetWindowLongPtr) to "SetWindowLongPtr"

- Adding definition for AdjustWindowRectEx

Author: vatsan-madhavan

src/User32/PublicAPI.Unshipped.txt

@@ -33,12 +33,12 @@ PInvoke.User32.SendMessageTimeoutFlags.SMTO_BLOCK = 1 -> PInvoke.User32.SendMess
 PInvoke.User32.SendMessageTimeoutFlags.SMTO_ERRORONEXIT = 32 -> PInvoke.User32.SendMessageTimeoutFlags
 PInvoke.User32.SendMessageTimeoutFlags.SMTO_NORMAL = 0 -> PInvoke.User32.SendMessageTimeoutFlags
 PInvoke.User32.SendMessageTimeoutFlags.SMTO_NOTIMEOUTIFNOTHUNG = 8 -> PInvoke.User32.SendMessageTimeoutFlags
-PInvoke.User32.WindowMessage.WM_DPICHANGED_AFTERPARENT = 739 -> PInvoke.User32.WindowMessage
-PInvoke.User32.WindowMessage.WM_DPICHANGED_BEFOREPARENT = 738 -> PInvoke.User32.WindowMessage
-PInvoke.User32.WindowMessage.WM_GETDPISCALEDSIZE = 740 -> PInvoke.User32.WindowMessage
 PInvoke.User32.WindowLongIndexFlags.GWLP_ID = PInvoke.User32.WindowLongIndexFlags.GWL_STYLE | PInvoke.User32.WindowLongIndexFlags.DWLP_DLGPROC -> PInvoke.User32.WindowLongIndexFlags
 PInvoke.User32.WindowLongIndexFlags.GWLP_USERDATA = -21 -> PInvoke.User32.WindowLongIndexFlags
 PInvoke.User32.WindowLongIndexFlags.GWLP_WNDPROC = PInvoke.User32.WindowLongIndexFlags.GWL_STYLE | PInvoke.User32.WindowLongIndexFlags.DWLP_DLGPROC | PInvoke.User32.WindowLongIndexFlags.DWLP_USER -> PInvoke.User32.WindowLongIndexFlags
+PInvoke.User32.WindowMessage.WM_DPICHANGED_AFTERPARENT = 739 -> PInvoke.User32.WindowMessage
+PInvoke.User32.WindowMessage.WM_DPICHANGED_BEFOREPARENT = 738 -> PInvoke.User32.WindowMessage
+PInvoke.User32.WindowMessage.WM_GETDPISCALEDSIZE = 740 -> PInvoke.User32.WindowMessage
 PInvoke.User32.mouse_eventFlags
 PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_ABSOLUTE = 32768 -> PInvoke.User32.mouse_eventFlags
 PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_HWHEEL = 4096 -> PInvoke.User32.mouse_eventFlags
@@ -52,14 +52,16 @@ PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_RIGHTUP = 16 -> PInvoke.User32.mouse
 PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_WHEEL = 2048 -> PInvoke.User32.mouse_eventFlags
 PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_XDOWN = 128 -> PInvoke.User32.mouse_eventFlags
 PInvoke.User32.mouse_eventFlags.MOUSEEVENTF_XUP = 256 -> PInvoke.User32.mouse_eventFlags
+static PInvoke.User32.AdjustWindowRectEx(System.IntPtr lpRect, PInvoke.User32.WindowStyles dwStyle, bool bMenu, PInvoke.User32.WindowStylesEx dwExStyle) -> bool
 static PInvoke.User32.AdjustWindowRectExForDpi(System.IntPtr lpRect, PInvoke.User32.WindowStyles dwStyle, bool bMenu, PInvoke.User32.WindowStylesEx dwExStyle, int dpi) -> bool
 static PInvoke.User32.CreateWindowEx(PInvoke.User32.WindowStylesEx dwExStyle, short lpClassName, string lpWindowName, PInvoke.User32.WindowStyles dwStyle, int x, int y, int nWidth, int nHeight, System.IntPtr hWndParent, System.IntPtr hMenu, System.IntPtr hInstance, System.IntPtr lpParam) -> System.IntPtr
 static PInvoke.User32.CreateWindowEx(PInvoke.User32.WindowStylesEx dwExStyle, short lpClassName, string lpWindowName, PInvoke.User32.WindowStyles dwStyle, int x, int y, int nWidth, int nHeight, System.IntPtr hWndParent, System.IntPtr hMenu, System.IntPtr hInstance, void* lpParam) -> System.IntPtr
 static PInvoke.User32.GetNextWindow(System.IntPtr hWnd, PInvoke.User32.GetNextWindowCommands wCmd) -> System.IntPtr
-static PInvoke.User32.SetWindowLongPtr(System.IntPtr hWnd, PInvoke.User32.WindowLongIndexFlags nIndex, void* dwNewLong) -> void*
 static PInvoke.User32.SetWindowLongPtr(System.IntPtr hWnd, PInvoke.User32.WindowLongIndexFlags nIndex, System.IntPtr dwNewLong) -> System.IntPtr
+static PInvoke.User32.SetWindowLongPtr(System.IntPtr hWnd, PInvoke.User32.WindowLongIndexFlags nIndex, void* dwNewLong) -> void*
 static PInvoke.User32.SystemParametersInfoForDpi(PInvoke.User32.SystemParametersInfoAction uiAction, int uiParam, System.IntPtr pvParam, PInvoke.User32.SystemParametersInfoFlags fWinIni, int dpi) -> bool
 static PInvoke.User32.mouse_event(PInvoke.User32.mouse_eventFlags dwFlags, int dx, int dy, int dwData, System.IntPtr dwExtraInfo) -> void
+static extern PInvoke.User32.AdjustWindowRectEx(PInvoke.RECT* lpRect, PInvoke.User32.WindowStyles dwStyle, bool bMenu, PInvoke.User32.WindowStylesEx dwExStyle) -> bool
 static extern PInvoke.User32.AdjustWindowRectExForDpi(PInvoke.RECT* lpRect, PInvoke.User32.WindowStyles dwStyle, bool bMenu, PInvoke.User32.WindowStylesEx dwExStyle, int dpi) -> bool
 static extern PInvoke.User32.AreDpiAwarenessContextsEqual(System.IntPtr dpiContextA, System.IntPtr dpiContextB) -> bool
 static extern PInvoke.User32.DestroyWindow(System.IntPtr hWnd) -> bool

src/User32/User32.cs

@@ -3320,6 +3320,54 @@ public static extern DPI_HOSTING_BEHAVIOR SetThreadDpiHostingBehavior(
         public static extern DPI_HOSTING_BEHAVIOR GetWindowDpiHostingBehavior(
             IntPtr hwnd);
 
+        /// <summary>
+        /// Calculates the required size of the window rectangle, based on the desired size of the client rectangle.
+        /// The window rectangle can then be passed to the CreateWindowEx function to create a window whose client area
+        /// is the desired size.
+        /// </summary>
+        /// <param name="lpRect">
+        /// A pointer to a RECT structure that contains the coordinates of the top-left and bottom-right corners
+        /// of the desired client area. When the function returns, the structure contains the coordinates of the top-left
+        /// and bottom-right corners of the window to accommodate the desired client area.
+        /// </param>
+        /// <param name="dwStyle">
+        /// The window style of the window whose required size is to be calculated. Note that you cannot specify
+        /// the <see cref="WindowStyles.WS_OVERLAPPED"/> style.</param>
+        /// <param name="bMenu">Indicates whether the window has a menu.</param>
+        /// <param name="dwExStyle">The extended window style of the window whose required size is to be calculated.</param>
+        /// <returns>
+        /// If the function succeeds, the return value is true.
+        /// If the function fails, the return value is false.
+        /// To get extended error information, call GetLastError.
+        /// </returns>
+        /// <remarks>
+        /// <para>
+        /// A client rectangle is the smallest rectangle that completely encloses a client area.
+        /// A window rectangle is the smallest rectangle that completely encloses the window, which includes
+        /// the client area and the nonclient area.
+        /// </para>
+        /// <para>
+        /// The AdjustWindowRectEx function does not add extra space when a menu bar wraps to two or more rows.
+        /// </para>
+        /// <para>
+        /// The AdjustWindowRectEx function does not take the <see cref="WindowStyles.WS_VSCROLL"/> or
+        /// <see cref="WindowStyles.WS_HSCROLL"/> styles into account.
+        /// To account for the scroll bars, call the GetSystemMetrics function with <see cref="SystemMetric.SM_CXVSCROLL"/> or
+        /// <see cref="SystemMetric.SM_CYHSCROLL"/>.
+        /// </para>
+        /// <para>
+        /// This API is not DPI aware, and should not be used if the calling thread is per-monitor DPI aware.
+        /// For the DPI-aware version of this API, see AdjustWindowsRectExForDPI.
+        /// </para>
+        /// </remarks>
+        [DllImport(nameof(User32), SetLastError = true)]
+        [return:MarshalAs(UnmanagedType.Bool)]
+        public static unsafe extern bool AdjustWindowRectEx(
+            RECT* lpRect,
+            WindowStyles dwStyle,
+            [MarshalAs(UnmanagedType.Bool)] bool bMenu,
+            WindowStylesEx dwExStyle);
+
         /// <summary>
         /// The BeginPaint function prepares the specified window for painting and fills a <see cref="PAINTSTRUCT"/> structure with information about the painting.
         /// </summary>
@@ -3589,7 +3637,7 @@ private static unsafe extern IntPtr CreateWindowEx(
         /// When compiling for 32-bit Windows, SetWindowLongPtr is defined as a call to the SetWindowLong function. This
         /// function is exposed using a helper that conditionally calls SetWindowLong in 32-bit processes.
         /// </remarks>
-        [DllImport(nameof(User32), SetLastError = true, EntryPoint = nameof(SetWindowLongPtr))]
+        [DllImport(nameof(User32), SetLastError = true, EntryPoint = "SetWindowLongPtr")]
         private static extern unsafe void* SetWindowLongPtr64(IntPtr hWnd, WindowLongIndexFlags nIndex, void* dwNewLong);
     }
 }