Merge pull request #2816 from hughbe/Cleanup-GETTEXTLENGHTEX

Cleanup EDITSTREAM

Author: RussKie

src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAM.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal partial class Interop
+{
+    internal static partial class Richedit
+    {
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        public struct EDITSTREAM
+        {
+            public UIntPtr dwCookie;
+            public uint dwError;
+            public IntPtr pfnCallback;
+        }
+    }
+}

src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.EDITSTREAMCALLBACK.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+internal partial class Interop
+{
+    internal static partial class Richedit
+    {
+        public delegate int EDITSTREAMCALLBACK(IntPtr dwCookie, IntPtr pbBuff, int cb, out int pcb);
+    }
+}

src/System.Windows.Forms.Primitives/src/Interop/Richedit/Interop.SF.cs

@@ -0,0 +1,29 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+internal partial class Interop
+{
+    internal static partial class Richedit
+    {
+        [Flags]
+        public enum SF : uint
+        {
+            TEXT = 0x0001,
+            RTF = 0x0002,
+            RTFNOOBJS = 0x0003,
+            TEXTIZED = 0x0004,
+            UNICODE = 0x0010,
+            USECODEPAGE = 0x0020,
+            NCRFORNONASCII = 0x0040,
+            RTFVAL = 0x0700,
+            F_PWD = 0x0800,
+            F_KEEPDOCINFO = 0x1000,
+            F_PERSISTVIEWSCALE = 0x2000,
+            F_PLAINRTF = 0x4000,
+            F_SELECTION = 0x8000,
+        }
+    }
+}

src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/NativeMethods.cs

@@ -159,23 +159,6 @@ public class HH_FTS_QUERY
             internal string pszWindow = null;
         }
 
-        public delegate int EditStreamCallback(IntPtr dwCookie, IntPtr buf, int cb, out int transferred);
-
-        [StructLayout(LayoutKind.Sequential)]
-        public class EDITSTREAM
-        {
-            public IntPtr dwCookie = IntPtr.Zero;
-            public int dwError = 0;
-            public EditStreamCallback pfnCallback = null;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public class EDITSTREAM64
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public byte[] contents = new byte[20];
-        }
-
         public delegate IntPtr WndProc(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
         public delegate int ListViewCompareCallback(IntPtr lParam1, IntPtr lParam2, IntPtr lParamSort);

src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Internals/UnsafeNativeMethods.cs

@@ -83,12 +83,6 @@ public static StringBuilder GetModuleFileNameLongPath(HandleRef hModule)
         [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
         public static extern int SendMessage(HandleRef hWnd, int msg, int wParam, [Out, MarshalAs(UnmanagedType.IUnknown)]out object editOle);
 
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr SendMessage(HandleRef hWnd, int msg, int wParam, NativeMethods.EDITSTREAM lParam);
-
-        [DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
-        public static extern IntPtr SendMessage(HandleRef hWnd, int msg, int wParam, NativeMethods.EDITSTREAM64 lParam);
-
         [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
         public static extern int GetDlgItemInt(IntPtr hWnd, int nIDDlgItem, bool[] err, bool signed);
 

src/System.Windows.Forms.Primitives/tests/Interop/Richedit/EDITSTREAMTests.cs

@@ -0,0 +1,25 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Xunit;
+using static Interop.Richedit;
+
+namespace System.Windows.Forms.Tests.Interop.Richedit
+{
+    public class EDITSTREAMTests : IClassFixture<ThreadExceptionFixture>
+    {
+        [WinFormsFact]
+        public unsafe void EditStream_Size_Get_ReturnsExpected()
+        {
+            if (IntPtr.Size == 4)
+            {
+                Assert.Equal(12, sizeof(EDITSTREAM));
+            }
+            else
+            {
+                Assert.Equal(20, sizeof(EDITSTREAM));
+            }
+        }
+    }
+}