Merge pull request #633 from dotnet/fix629

Fix DLGTEMPLATE and DLGITEMTEMPLATE field sizes
dotnet · Jan 3, 2023 · c01077e · c01077e
2 parents 4ded1cd + f0efeec
commit c01077e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 28 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -200,6 +200,9 @@ anything else found in native header files for these reasons:
 
 | C/C++ type  | C# type   |
 | ----------- | --------- |
+| `short`     | `short`   |
+| `WORD`      | `ushort`  |
+| `DWORD`     | `uint`    |
 | `int`       | `int`     |
 | `long`      | `int`     |
 | `long long` | `long`    |

diff --git a/src/User32/PublicAPI.Shipped.txt b/src/User32/PublicAPI.Shipped.txt
@@ -164,22 +164,22 @@ PInvoke.User32.DISPLAYCONFIG_VIDEO_SIGNAL_INFO.vSyncFreq -> PInvoke.User32.DISPL
 PInvoke.User32.DISPLAYCONFIG_VIDEO_SIGNAL_INFO.videoStandard -> uint
 PInvoke.User32.DLGITEMTEMPLATE
 PInvoke.User32.DLGITEMTEMPLATE.DLGITEMTEMPLATE() -> void
-PInvoke.User32.DLGITEMTEMPLATE.cx -> byte
-PInvoke.User32.DLGITEMTEMPLATE.cy -> byte
-PInvoke.User32.DLGITEMTEMPLATE.dwExtendedStyle -> int
-PInvoke.User32.DLGITEMTEMPLATE.id -> short
-PInvoke.User32.DLGITEMTEMPLATE.style -> int
-PInvoke.User32.DLGITEMTEMPLATE.x -> byte
-PInvoke.User32.DLGITEMTEMPLATE.y -> byte
+PInvoke.User32.DLGITEMTEMPLATE.cx -> short
+PInvoke.User32.DLGITEMTEMPLATE.cy -> short
+PInvoke.User32.DLGITEMTEMPLATE.dwExtendedStyle -> uint
+PInvoke.User32.DLGITEMTEMPLATE.id -> ushort
+PInvoke.User32.DLGITEMTEMPLATE.style -> uint
+PInvoke.User32.DLGITEMTEMPLATE.x -> short
+PInvoke.User32.DLGITEMTEMPLATE.y -> short
 PInvoke.User32.DLGTEMPLATE
 PInvoke.User32.DLGTEMPLATE.DLGTEMPLATE() -> void
-PInvoke.User32.DLGTEMPLATE.cdit -> short
-PInvoke.User32.DLGTEMPLATE.cx -> byte
-PInvoke.User32.DLGTEMPLATE.cy -> byte
-PInvoke.User32.DLGTEMPLATE.dwExtendedStyle -> int
-PInvoke.User32.DLGTEMPLATE.style -> int
-PInvoke.User32.DLGTEMPLATE.x -> byte
-PInvoke.User32.DLGTEMPLATE.y -> byte
+PInvoke.User32.DLGTEMPLATE.cdit -> ushort
+PInvoke.User32.DLGTEMPLATE.cx -> short
+PInvoke.User32.DLGTEMPLATE.cy -> short
+PInvoke.User32.DLGTEMPLATE.dwExtendedStyle -> uint
+PInvoke.User32.DLGTEMPLATE.style -> uint
+PInvoke.User32.DLGTEMPLATE.x -> short
+PInvoke.User32.DLGTEMPLATE.y -> short
 PInvoke.User32.DRAWTEXTPARAMS
 PInvoke.User32.DRAWTEXTPARAMS.DRAWTEXTPARAMS() -> void
 PInvoke.User32.DRAWTEXTPARAMS.cbSize -> uint

diff --git a/src/User32/User32+DLGITEMTEMPLATE.cs b/src/User32/User32+DLGITEMTEMPLATE.cs
@@ -21,40 +21,40 @@ public struct DLGITEMTEMPLATE
             ///     The style of the control. This member can be a combination of window style values (such as WS_BORDER) and one or
             ///     more of the control style values (such as BS_PUSHBUTTON and ES_LEFT).
             /// </summary>
-            public int style;
+            public uint style;
 
             /// <summary>
             ///     The extended styles for a window. This member is not used to create controls in dialog boxes, but applications that
             ///     use dialog box templates can use it to create other types of windows.
             /// </summary>
-            public int dwExtendedStyle;
+            public uint dwExtendedStyle;
 
             /// <summary>
             ///     The x-coordinate, in dialog box units, of the upper-left corner of the control. This coordinate is always relative
             ///     to the upper-left corner of the dialog box's client area.
             /// </summary>
-            public byte x;
+            public short x;
 
             /// <summary>
             ///     The y-coordinate, in dialog box units, of the upper-left corner of the control. This coordinate is always relative
             ///     to the upper-left corner of the dialog box's client area.
             /// </summary>
-            public byte y;
+            public short y;
 
             /// <summary>
             ///     The width, in dialog box units, of the control.
             /// </summary>
-            public byte cx;
+            public short cx;
 
             /// <summary>
             ///     The height, in dialog box units, of the control.
             /// </summary>
-            public byte cy;
+            public short cy;
 
             /// <summary>
             ///     The control identifier.
             /// </summary>
-            public short id;
+            public ushort id;
         }
     }
 }
diff --git a/src/User32/User32+DLGTEMPLATE.cs b/src/User32/User32+DLGTEMPLATE.cs
@@ -31,38 +31,38 @@ public struct DLGTEMPLATE
             ///     </para>
             ///     <para>The DS_SHELLFONT style is not supported in the DLGTEMPLATE header.</para>
             /// </summary>
-            public int style;
+            public uint style;
 
             /// <summary>
             ///     The extended styles for a window. This member is not used to create dialog boxes, but applications that use dialog
             ///     box templates can use it to create other types of windows.
             /// </summary>
-            public int dwExtendedStyle;
+            public uint dwExtendedStyle;
 
             /// <summary>
             ///     The number of items in the dialog box.
             /// </summary>
-            public short cdit;
+            public ushort cdit;
 
             /// <summary>
             ///     The x-coordinate, in dialog box units, of the upper-left corner of the dialog box.
             /// </summary>
-            public byte x;
+            public short x;
 
             /// <summary>
             ///     The y-coordinate, in dialog box units, of the upper-left corner of the dialog box.
             /// </summary>
-            public byte y;
+            public short y;
 
             /// <summary>
             ///     The width, in dialog box units, of the dialog box.
             /// </summary>
-            public byte cx;
+            public short cx;
 
             /// <summary>
             ///     The height, in dialog box units, of the dialog box.
             /// </summary>
-            public byte cy;
+            public short cy;
         }
     }
 }