Fix IFont and IPicture definitions (#2736)

dotnet · Jan 19, 2020 · 0daa37a · 0daa37a
1 parent e69016e
commit 0daa37a
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 76 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IFont.cs
@@ -12,7 +12,7 @@ internal static partial class Ole32
         [ComImport]
         [Guid("BEF6E002-A874-101A-8BBA-00AA00300CAB")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        public interface IFont
+        public unsafe interface IFont
         {
             string Name { get; set; }
             long Size { get; set; }
@@ -37,13 +37,21 @@ HRESULT SetRatio(
                 int cyLogical,
                 int cyHimetric);
 
+            [PreserveSig]
+            HRESULT QueryTextMetrics(
+                Gdi32.TEXTMETRICW* pTM);
+
             [PreserveSig]
             HRESULT AddRefHfont(
                 IntPtr hFont);
 
             [PreserveSig]
             HRESULT ReleaseHfont(
                 IntPtr hFont);
+
+            [PreserveSig]
+            HRESULT SetHdc(
+                IntPtr hDC);
         }
     }
 }
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPicture.cs
@@ -9,14 +9,22 @@ internal static partial class Interop
 {
     internal static partial class Ole32
     {
-        [ComImport()]
+        [ComImport]
         [Guid("7BF80980-BF32-101A-8BBB-00AA00300CAB")]
         [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
         public interface IPicture
         {
-            uint Handle { get; }
+            /// <remarks>
+            ///  IPicture handles are sign extended on 64 bit devices. To preserve
+            ///  the sign, handles should be represented as ints, not uints.
+            /// </remarks>
+            int Handle { get; }
 
-            uint hPal { get; }
+            /// <remarks>
+            ///  HPALETTE handles are sign extended on 64 bit devices. To preserve
+            ///  the sign, handles should be represented as ints, not uints.
+            /// </remarks>
+            int hPal { get; }
 
             /// <remarks>
             ///  This is actually <see cref="PICTYPE"/>, but we can't describe it as such.

diff --git a/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs b/src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.IPictureDisp.cs
@@ -9,14 +9,22 @@ internal static partial class Interop
 {
     internal static partial class Ole32
     {
-        [ComImport()]
+        [ComImport]
         [Guid("7BF80981-BF32-101A-8BBB-00AA00300CAB")]
         [InterfaceType(ComInterfaceType.InterfaceIsIDispatch)]
         internal unsafe interface IPictureDisp
         {
-            uint Handle { get; }
+            /// <remarks>
+            ///  IPicture handles are sign extended on 64 bit devices. To preserve
+            ///  the sign, handles should be represented as ints, not uints.
+            /// </remarks>
+            int Handle { get; }
 
-            uint hPal { get; }
+            /// <remarks>
+            ///  HPALETTE handles are sign extended on 64 bit devices. To preserve
+            ///  the sign, handles should be represented as ints, not uints.
+            /// </remarks>
+            int hPal { get; }
 
             /// <remarks>
             ///  This is actually <see cref="PICTYPE"/>, but we can't describe it as such.

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
@@ -4027,7 +4027,7 @@ protected static Image GetPictureFromIPicture(object picture)
                 return null;
             }
 
-            uint hPal = default;
+            int hPal = default;
             Ole32.IPicture pict = (Ole32.IPicture)picture;
             Ole32.PICTYPE type = (Ole32.PICTYPE)pict.Type;
             if (type == Ole32.PICTYPE.BITMAP)
@@ -4055,7 +4055,7 @@ protected unsafe static Image GetPictureFromIPictureDisp(object picture)
                 return null;
             }
 
-            uint hPal = default;
+            int hPal = default;
             Ole32.IPictureDisp pict = (Ole32.IPictureDisp)picture;
             Ole32.PICTYPE type = (Ole32.PICTYPE)pict.Type;
             if (type == Ole32.PICTYPE.BITMAP)
@@ -4075,9 +4075,9 @@ protected unsafe static Image GetPictureFromIPictureDisp(object picture)
         }
 
         private static Image GetPictureFromParams(
-            uint handle,
+            int handle,
             Ole32.PICTYPE type,
-            uint paletteHandle,
+            int paletteHandle,
             int width,
             int height)
         {