Add a few more EMF tests (#12969)

Move a few interop definitions down and add some more EMF tests to ensure we have #12951 fully covered.

Author: JeremyKuhne

src/System.Drawing.Common/tests/System/Drawing/ImageTests.cs

@@ -5,6 +5,9 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using Microsoft.DotNet.XUnitExtensions;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Gdi;
 using Encoder = System.Drawing.Imaging.Encoder;
 
 namespace System.Drawing.Tests;
@@ -663,4 +666,71 @@ public void Save_InvalidDirectory_ThrowsDirectoryNotFoundException()
         string badTarget = Path.Join("NoSuchDirectory", "NoSuchFile");
         AssertExtensions.Throws<DirectoryNotFoundException>(() => bitmap.Save(badTarget), $"The directory NoSuchDirectory of the filename {badTarget} does not exist.");
     }
+
+    [Fact]
+    public unsafe void FromStream_NativeMetafile()
+    {
+        // Create a memory metafile from the screen DC
+        HDC hdc = PInvokeCore.CreateEnhMetaFile(HDC.Null, default, null, default(PCWSTR));
+        using CreatePenScope pen = new(Color.Red);
+        using SelectObjectScope penScope = new(hdc, pen);
+        PInvokeCore.Rectangle(hdc, 10, 10, 100, 100);
+        HENHMETAFILE hemf = PInvokeCore.CloseEnhMetaFile(hdc);
+
+        uint length = PInvokeCore.GetEnhMetaFileBits(hemf, 0, null);
+        byte[] buffer = new byte[length];
+        length = PInvokeCore.GetEnhMetaFileBits(hemf, buffer);
+        PInvokeCore.DeleteEnhMetaFile(hemf);
+
+        MemoryStream stream = new(buffer);
+        using Image image = Image.FromStream(stream);
+        image.Size.Should().Be(new Size(90, 90));
+
+        // The stream must be at the beginning for WMF/EMF
+        stream.Position = 10;
+        Action action = () => Image.FromStream(stream);
+        action.Should().Throw<ArgumentException>();
+
+        // https://github.com/dotnet/winforms/issues/12951
+        stream.Position = 0;
+        using Image image2 = Image.FromStream(new NonSeekableStreamWrapper(stream));
+    }
+
+    public class NonSeekableStreamWrapper : Stream
+    {
+        private readonly Stream _innerStream;
+
+        public NonSeekableStreamWrapper(Stream innerStream) =>
+            _innerStream = innerStream ?? throw new ArgumentNullException(nameof(innerStream));
+
+        public override bool CanRead => _innerStream.CanRead;
+        public override bool CanSeek => false;
+        public override bool CanWrite => _innerStream.CanWrite;
+        public override long Length => throw new NotSupportedException("This stream does not support seeking.");
+        public override long Position
+        {
+            get => throw new NotSupportedException("This stream does not support seeking.");
+            set => throw new NotSupportedException("This stream does not support seeking.");
+        }
+
+        public override void Flush() => _innerStream.Flush();
+
+        public override int Read(byte[] buffer, int offset, int count) => _innerStream.Read(buffer, offset, count);
+
+        public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException("This stream does not support seeking.");
+
+        public override void SetLength(long value) => _innerStream.SetLength(value);
+
+        public override void Write(byte[] buffer, int offset, int count) => _innerStream.Write(buffer, offset, count);
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _innerStream.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+    }
 }

src/System.Drawing.Common/tests/System/Drawing/Imaging/MetafileTests.cs

@@ -24,6 +24,9 @@
 //
 
 using System.Runtime.InteropServices;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Gdi;
 
 namespace System.Drawing.Imaging.Tests;
 
@@ -1014,4 +1017,42 @@ private static void AssertMetafileHeader(MetafileHeader header)
         Assert.Equal((int)MetafileType.Wmf, header.WmfHeader.Type);
         Assert.Equal(0x300, header.WmfHeader.Version);
     }
+
+    [Fact]
+    public unsafe void CreateFromNativeHandle_Success()
+    {
+        // Create a memory metafile from the screen DC
+        HDC hdc = PInvokeCore.CreateEnhMetaFile(HDC.Null, default, null, default(PCWSTR));
+        using CreatePenScope pen = new(Color.Blue);
+        using CreateBrushScope brush = new(Color.Green);
+        using SelectObjectScope penScope = new(hdc, pen);
+        using SelectObjectScope brushScope = new(hdc, brush);
+        PInvokeCore.Rectangle(hdc, 10, 10, 100, 100);
+        HENHMETAFILE hemf = PInvokeCore.CloseEnhMetaFile(hdc);
+
+        Metafile metafile = new(henhmetafile: (nint)hemf.Value, deleteEmf: true);
+        metafile.Size.Should().Be(new Size(90, 90));
+
+        List<EmfPlusRecordType> recordTypes = [];
+        using Graphics graphics = Graphics.FromHwnd(0);
+        graphics.EnumerateMetafile(
+            metafile,
+            default(Point),
+            (recordType, flags, dataSize, data, _) =>
+            {
+                recordTypes.Add(recordType);
+                return true;
+            });
+
+        recordTypes.Should().BeEquivalentTo(
+            [
+                EmfPlusRecordType.EmfHeader,
+                EmfPlusRecordType.EmfCreatePen,
+                EmfPlusRecordType.EmfSelectObject,
+                EmfPlusRecordType.EmfCreateBrushIndirect,
+                EmfPlusRecordType.EmfSelectObject,
+                EmfPlusRecordType.EmfRectangle,
+                EmfPlusRecordType.EmfEof
+            ]);
+    }
 }

src/System.Private.Windows.Core/src/NativeMethods.txt

@@ -9,6 +9,7 @@ CFSTR_FILENAMEA
 CFSTR_INDRAGLOOP
 CLIPBOARD_FORMAT
 CLIPBRD_E_BAD_DATA
+CloseEnhMetaFile
 CLR_*
 CoCreateInstance
 CombineRgn
@@ -19,6 +20,7 @@ CreateCompatibleBitmap
 CreateCompatibleDC
 CreateDC
 CreateDIBSection
+CreateEnhMetaFileW
 CreateFontIndirect
 CreateICW
 CreatePen
@@ -27,6 +29,7 @@ CreateSolidBrush
 DATA_S_SAMEFORMATETC
 DefWindowProc
 DeleteDC
+DeleteEnhMetaFile
 DeleteObject
 DestroyIcon
 DEVMODEW
@@ -80,6 +83,7 @@ EM_*
 EndPaint
 EnumChildWindows
 EnumDisplayMonitors
+EnumEnhMetaFile
 EnumThreadWindows
 EnumWindows
 FACILITY_CODE
@@ -95,6 +99,7 @@ GetDC
 GetDCEx
 GetDesktopWindow
 GetDeviceCaps
+GetEnhMetaFileBits
 GetForegroundWindow
 GetGuiResources
 GetIconInfo
@@ -203,6 +208,7 @@ PropVariantClear
 PWSTR
 RealizePalette
 RECT
+Rectangle
 REGDB_E_CLASSNOTREG
 RegisterClipboardFormat
 RegisterDragDrop

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DesignerUtils.cs

@@ -267,7 +267,7 @@ public static void DrawNoResizeHandle(Graphics graphics, Rectangle bounds, bool
         using SelectObjectScope penSelection = new(hDC, s_grabHandlePenPrimary);
 
         // Draw our rect no-resize handle
-        PInvoke.Rectangle(hDC, bounds.Left, bounds.Top, bounds.Right, bounds.Bottom);
+        PInvokeCore.Rectangle(hDC, bounds.Left, bounds.Top, bounds.Right, bounds.Bottom);
     }
 
     /// <summary>
@@ -291,7 +291,7 @@ public static void DrawLockedHandle(Graphics graphics, Rectangle bounds, bool is
 
         // Lower rect - its fillbrush depends on the primary selection
         PInvokeCore.SelectObject(hDC, isPrimary ? s_grabHandleFillBrushPrimary : s_grabHandleFillBrush);
-        PInvoke.Rectangle(hDC, bounds.Left, bounds.Top + s_lockedHandleLowerOffset, bounds.Right, bounds.Bottom);
+        PInvokeCore.Rectangle(hDC, bounds.Left, bounds.Top + s_lockedHandleLowerOffset, bounds.Right, bounds.Bottom);
     }
 
     /// <summary>

src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/OleDragDropHandler.cs

@@ -442,7 +442,7 @@ private static void DrawReversibleFrame(HWND handle, Rectangle rectangle, Color
         using SelectObjectScope penSelection = new(dc, pen);
 
         PInvokeCore.SetBkColor(dc, (COLORREF)(uint)ColorTranslator.ToWin32(graphicsColor));
-        PInvoke.Rectangle(dc, rectangle.X, rectangle.Y, rectangle.Right, rectangle.Bottom);
+        PInvokeCore.Rectangle(dc, rectangle.X, rectangle.Y, rectangle.Right, rectangle.Bottom);
         // ------ Duplicate code----------------------------------------------------------
     }
 

src/System.Windows.Forms.Primitives/src/NativeMethods.txt

@@ -34,7 +34,6 @@ ClientToScreen
 CLIPBRD_E_BAD_DATA
 ClipCursor
 CloseDesktop
-CloseEnhMetaFile
 CloseHandle
 CloseThemeData
 CLSCTX
@@ -49,7 +48,6 @@ CoRegisterMessageFilter
 CreateAcceleratorTableW
 CreateActCtx
 CreateBrushIndirect
-CreateEnhMetaFileW
 CreateHalftonePalette
 CreateILockBytesOnHGlobal
 CreateMenu
@@ -64,7 +62,6 @@ DATETIMEPICK_CLASS
 DeactivateActCtx
 DefFrameProc
 DefMDIChildProc
-DeleteEnhMetaFile
 DESKTOP_ACCESS_FLAGS
 DestroyAcceleratorTable
 DestroyCursor
@@ -108,7 +105,6 @@ EnableWindow
 EndDialog
 ENM_*
 EnumDisplaySettings
-EnumEnhMetaFile
 ES_*
 EVENTMSG
 ExpandCollapseState
@@ -519,7 +515,6 @@ PROPERTYKEY
 ProviderOptions
 ReadClassStg
 READYSTATE
-Rectangle
 RedrawWindow
 REGDB_E_CLASSNOTREG
 RegisterClass

src/System.Windows.Forms.Primitives/src/System/Windows/Forms/DeviceContextExtensions.cs

@@ -34,7 +34,7 @@ internal static void DrawRectangle(
         using SetRop2Scope ropScope = new(hdc, R2_MODE.R2_COPYPEN);
         using SelectObjectScope brushScope = new(hdc, PInvokeCore.GetStockObject(GET_STOCK_OBJECT_FLAGS.NULL_BRUSH));
 
-        PInvoke.Rectangle(hdc, left, top, right, bottom);
+        PInvokeCore.Rectangle(hdc, left, top, right, bottom);
     }
 
     internal static void FillRectangle(this DeviceContextHdcScope hdc, Rectangle rectangle, HBRUSH hbrush) =>

src/System.Windows.Forms.Primitives/tests/TestUtilities/Metafiles/EmfScope.cs

@@ -44,7 +44,7 @@ private static unsafe HDC CreateEnhMetaFile(
         fixed (char* pFileName = lpFilename)
         fixed (char* pDesc = lpDesc)
         {
-            HDC metafileHdc = PInvoke.CreateEnhMetaFile(hdc, pFileName, lprc, pDesc);
+            HDC metafileHdc = PInvokeCore.CreateEnhMetaFile(hdc, pFileName, lprc, pDesc);
             if (metafileHdc.IsNull)
             {
                 throw new Win32Exception("Could not create metafile");
@@ -67,7 +67,7 @@ public HENHMETAFILE HENHMETAFILE
                     return default;
                 }
 
-                _hemf = PInvoke.CloseEnhMetaFile(HDC);
+                _hemf = PInvokeCore.CloseEnhMetaFile(HDC);
             }
 
             return _hemf;
@@ -80,7 +80,7 @@ public unsafe void Enumerate(ProcessRecordDelegate enumerator)
         try
         {
             IntPtr callback = Marshal.GetFunctionPointerForDelegate(CallBack);
-            PInvoke.EnumEnhMetaFile(
+            PInvokeCore.EnumEnhMetaFile(
                 default,
                 HENHMETAFILE,
                 (delegate* unmanaged[Stdcall]<HDC, HANDLETABLE*, ENHMETARECORD*, int, LPARAM, int>)callback,
@@ -250,7 +250,7 @@ public void Dispose()
     {
         if (!HDC.IsNull)
         {
-            PInvoke.DeleteEnhMetaFile(HENHMETAFILE);
+            PInvokeCore.DeleteEnhMetaFile(HENHMETAFILE);
         }
 
         GC.SuppressFinalize(this);

src/System.Windows.Forms/src/System/Windows/Forms/Rendering/ControlPaint.cs

@@ -1815,7 +1815,7 @@ public static void DrawReversibleFrame(Rectangle rectangle, Color backColor, Fra
         using SelectObjectScope penSelection = new(desktopDC, pen);
 
         PInvokeCore.SetBkColor(desktopDC, (COLORREF)(uint)ColorTranslator.ToWin32(graphicsColor));
-        PInvoke.Rectangle(desktopDC, rectangle.X, rectangle.Y, rectangle.Right, rectangle.Bottom);
+        PInvokeCore.Rectangle(desktopDC, rectangle.X, rectangle.Y, rectangle.Right, rectangle.Bottom);
     }
 
     /// <summary>