Merge pull request #12972 from JeremyKuhne/movebitmapcopy

Move bitmap copy code to HBITMAP

Author: LeafShi1

src/System.Private.Windows.Core/src/Windows/Win32/Graphics/Gdi/HBITMAP.cs

@@ -12,4 +12,35 @@ public void Dispose()
             PInvokeCore.DeleteObject(this);
         }
     }
+
+    /// <summary>
+    ///  Creates a compatible bitmap copying the content of the current bitmap.
+    /// </summary>
+    public HBITMAP CreateCompatibleBitmap(int width, int height)
+    {
+        using var screenDC = GetDcScope.ScreenDC;
+
+        // Create a compatible DC to render the source bitmap.
+        using CreateDcScope sourceDC = new(screenDC);
+        using SelectObjectScope sourceBitmapSelection = new(sourceDC, this);
+
+        // Create a compatible DC and a new compatible bitmap.
+        using CreateDcScope destinationDC = new(screenDC);
+        HBITMAP compatibleBitmap = PInvokeCore.CreateCompatibleBitmap(screenDC, width, height);
+
+        // Select the new bitmap into a compatible DC and blit in the original bitmap.
+        using SelectObjectScope destinationBitmapSelection = new(destinationDC, compatibleBitmap);
+        PInvokeCore.BitBlt(
+            destinationDC,
+            0,
+            0,
+            width,
+            height,
+            sourceDC,
+            0,
+            0,
+            ROP_CODE.SRCCOPY);
+
+        return compatibleBitmap;
+    }
 }

src/System.Windows.Forms/src/System/Windows/Forms/OLE/WinFormsOleServices.cs

@@ -46,46 +46,15 @@ static unsafe HRESULT IOleServices.GetDataHere(string format, object data, FORMA
         {
             if (format.Equals(DataFormatNames.Bitmap) && data is Bitmap bitmap)
             {
-                // Save bitmap
-                pmedium->u.hBitmap = GetCompatibleBitmap(bitmap);
+                // GDI+ returns a DIBSECTION based HBITMAP. The clipboard only deals well with bitmaps created using
+                // CreateCompatibleBitmap(). So, we convert the DIBSECTION into a compatible bitmap.
+                pmedium->u.hBitmap = bitmap.GetHBITMAP().CreateCompatibleBitmap(bitmap.Width, bitmap.Height);
             }
 
             return HRESULT.S_OK;
         }
 
         return HRESULT.DV_E_TYMED;
-
-        static HBITMAP GetCompatibleBitmap(Bitmap bitmap)
-        {
-            using var screenDC = GetDcScope.ScreenDC;
-
-            // GDI+ returns a DIBSECTION based HBITMAP. The clipboard only deals well with bitmaps created using
-            // CreateCompatibleBitmap(). So, we convert the DIBSECTION into a compatible bitmap.
-            HBITMAP hbitmap = bitmap.GetHBITMAP();
-
-            // Create a compatible DC to render the source bitmap.
-            using CreateDcScope sourceDC = new(screenDC);
-            using SelectObjectScope sourceBitmapSelection = new(sourceDC, hbitmap);
-
-            // Create a compatible DC and a new compatible bitmap.
-            using CreateDcScope destinationDC = new(screenDC);
-            HBITMAP compatibleBitmap = PInvokeCore.CreateCompatibleBitmap(screenDC, bitmap.Size.Width, bitmap.Size.Height);
-
-            // Select the new bitmap into a compatible DC and render the blt the original bitmap.
-            using SelectObjectScope destinationBitmapSelection = new(destinationDC, compatibleBitmap);
-            PInvokeCore.BitBlt(
-                destinationDC,
-                0,
-                0,
-                bitmap.Size.Width,
-                bitmap.Size.Height,
-                sourceDC,
-                0,
-                0,
-                ROP_CODE.SRCCOPY);
-
-            return compatibleBitmap;
-        }
     }
 
     static unsafe bool IOleServices.TryGetBitmapFromDataObject<T>(Com.IDataObject* dataObject, [NotNullWhen(true)] out T data)