Merge pull request #594 from dotnet/BitBltFix

Fix BitBlt to take `SafeDCHandle`
dotnet · Jan 25, 2022 · 2634eea · 2634eea
2 parents 67c2d73 + 7a51f66
commit 2634eea
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/Gdi32/Gdi32.cs b/src/Gdi32/Gdi32.cs
@@ -56,7 +56,7 @@ public static extern int GetDeviceCaps(
 
         [DllImport(nameof(Gdi32))]
         [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool BitBlt(IntPtr hObject, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hObjectSource, int nXSrc, int nYSrc, int dwRop);
+        public static extern bool BitBlt(User32.SafeDCHandle hObject, int nXDest, int nYDest, int nWidth, int nHeight, User32.SafeDCHandle hObjectSource, int nXSrc, int nYSrc, int dwRop);
 
         [DllImport(nameof(Gdi32))]
         public static extern IntPtr CreateCompatibleBitmap(User32.SafeDCHandle hDC, int nWidth, int nHeight);

diff --git a/src/Gdi32/PublicAPI.Shipped.txt b/src/Gdi32/PublicAPI.Shipped.txt
@@ -60,7 +60,6 @@ PInvoke.Gdi32.StockObject.SYSTEM_FIXED_FONT = 16 -> PInvoke.Gdi32.StockObject
 PInvoke.Gdi32.StockObject.SYSTEM_FONT = 13 -> PInvoke.Gdi32.StockObject
 PInvoke.Gdi32.StockObject.WHITE_BRUSH = 0 -> PInvoke.Gdi32.StockObject
 PInvoke.Gdi32.StockObject.WHITE_PEN = 6 -> PInvoke.Gdi32.StockObject
-static extern PInvoke.Gdi32.BitBlt(System.IntPtr hObject, int nXDest, int nYDest, int nWidth, int nHeight, System.IntPtr hObjectSource, int nXSrc, int nYSrc, int dwRop) -> bool
 static extern PInvoke.Gdi32.CreateCompatibleBitmap(PInvoke.User32.SafeDCHandle hDC, int nWidth, int nHeight) -> System.IntPtr
 static extern PInvoke.Gdi32.CreateCompatibleDC(PInvoke.User32.SafeDCHandle hDC) -> PInvoke.User32.SafeDCHandle
 static extern PInvoke.Gdi32.DeleteDC(PInvoke.User32.SafeDCHandle hDC) -> bool

diff --git a/src/Gdi32/PublicAPI.Unshipped.txt b/src/Gdi32/PublicAPI.Unshipped.txt
@@ -0,0 +1 @@
+static extern PInvoke.Gdi32.BitBlt(PInvoke.User32.SafeDCHandle hObject, int nXDest, int nYDest, int nWidth, int nHeight, PInvoke.User32.SafeDCHandle hObjectSource, int nXSrc, int nYSrc, int dwRop) -> bool
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		static extern PInvoke.Gdi32.BitBlt(PInvoke.User32.SafeDCHandle hObject, int nXDest, int nYDest, int nWidth, int nHeight, PInvoke.User32.SafeDCHandle hObjectSource, int nXSrc, int nYSrc, int dwRop) -> bool