Skip to content
This repository was archived by the owner on Jul 26, 2023. It is now read-only.

Commit 7281ed0

Browse files
authored
Merge pull request #372 from vbfox/minmax_and_window_info
Fix ordering in MINMAXINFO and WINDOWINFO
2 parents cb7e5fb + 75f9276 commit 7281ed0

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

src/User32/User32+WINDOWINFO.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace PInvoke
55
{
6-
using System;
76
using System.Runtime.InteropServices;
87

98
/// <content>
@@ -14,15 +13,15 @@ public partial class User32
1413
[StructLayout(LayoutKind.Sequential)]
1514
public struct WINDOWINFO
1615
{
17-
public ushort atomWindowType;
1816
public uint cbSize;
19-
public uint cxWindowBorders;
20-
public uint cyWindowBorders;
21-
public uint dwExStyle;
17+
public RECT rcWindow;
18+
public RECT rcClient;
2219
public uint dwStyle;
20+
public uint dwExStyle;
2321
public uint dwWindowStatus;
24-
public RECT rcClient;
25-
public RECT rcWindow;
22+
public uint cxWindowBorders;
23+
public uint cyWindowBorders;
24+
public ushort atomWindowType;
2625
public ushort wCreatorVersion;
2726

2827
public static WINDOWINFO Create()

src/User32/User32+WINMAXINFO.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ public partial class User32
1313
[StructLayout(LayoutKind.Sequential)]
1414
public struct MINMAXINFO
1515
{
16-
public POINT ptMaxPosition;
16+
public POINT ptReserved;
1717
public POINT ptMaxSize;
18-
public POINT ptMaxTrackSize;
18+
public POINT ptMaxPosition;
1919
public POINT ptMinTrackSize;
20-
public POINT ptReserved;
20+
public POINT ptMaxTrackSize;
2121
}
2222
}
2323
}

0 commit comments

Comments
 (0)