Remove all ElementUtil allocations and stop boxing in DispatcherOperation

Microsoft.Dotnet.Wpf.sln

@@ -34,6 +34,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsBase", "src\Microsoft.DotNet.Wpf\src\WindowsBase\WindowsBase.csproj", "{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectWriteForwarder", "src\Microsoft.DotNet.Wpf\src\DirectWriteForwarder\DirectWriteForwarder.vcxproj", "{50A5318F-3B9A-48B9-9615-D5FA9D6D9C3E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E} = {FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationCore", "src\Microsoft.DotNet.Wpf\src\PresentationCore\PresentationCore.csproj", "{74C63A45-EAE5-407A-9F89-E0C6BC604841}"
 EndProject
@@ -157,6 +160,13 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationFramework.Royale-ref", "src\Microsoft.DotNet.Wpf\src\Themes\PresentationFramework.Royale\ref\PresentationFramework.Royale-ref.csproj", "{598B6188-937C-448B-8E6B-925F000BC076}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "System.Printing", "src\Microsoft.DotNet.Wpf\src\System.Printing\System.Printing.vcxproj", "{765E6BBC-772B-4808-BB72-E85615E8F237}"
+	ProjectSection(ProjectDependencies) = postProject
+		{17AA6CC2-CAE3-429C-B065-B76B8E14C632} = {17AA6CC2-CAE3-429C-B065-B76B8E14C632}
+		{74C63A45-EAE5-407A-9F89-E0C6BC604841} = {74C63A45-EAE5-407A-9F89-E0C6BC604841}
+		{9AC36357-34B7-40A1-95CA-FE9F46D089A7} = {9AC36357-34B7-40A1-95CA-FE9F46D089A7}
+		{B0C1157E-8664-44C4-AD8E-35CD6A78C769} = {B0C1157E-8664-44C4-AD8E-35CD6A78C769}
+		{FA69991B-9696-42D0-A5C7-F5E73F0DEE9E} = {FA69991B-9696-42D0-A5C7-F5E73F0DEE9E}
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PresentationUI", "src\Microsoft.DotNet.Wpf\src\PresentationUI\PresentationUI.csproj", "{B8E5B99C-D162-4DCA-9C4F-90CF2CDE942E}"
 EndProject

src/Microsoft.DotNet.Wpf/ApiCompat/Baselines/WindowsBase-ref-Net48.baseline.txt

@@ -32,4 +32,7 @@ CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsCompatibleWit
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsDefinitionAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Markup.XmlnsPrefixAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
 CannotRemoveBaseTypeOrInterface : Type 'System.Windows.Media.DisableDpiAwarenessAttribute' does not implement interface 'System.Runtime.InteropServices._Attribute' in the implementation but it does in the contract.
-Total Issues: 33
+CannotMakeTypeAbstract : Type 'System.Windows.Threading.DispatcherOperation' is abstract in the implementation but is not abstract in the contract.
+MembersMustExist : Member 'protected System.Object System.Windows.Threading.DispatcherOperation.InvokeDelegateCore()' does not exist in the implementation but it does exist in the contract.
+MembersMustExist : Member 'protected System.Object System.Windows.Threading.DispatcherOperation<TResult>.InvokeDelegateCore()' does not exist in the implementation but it does exist in the contract.
+Total Issues: 36

src/Microsoft.DotNet.Wpf/src/PresentationCore/MS/internal/Automation/DockProviderWrapper.cs

@@ -1,124 +1,47 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-//
-// 
-//
-// Description: Dock pattern provider wrapper for WCP
-//
-//
+#nullable enable
 
-using System.Windows.Threading;
 using System.Windows.Automation;
 using System.Windows.Automation.Provider;
 using System.Windows.Automation.Peers;
 
-namespace MS.Internal.Automation
-{
-    // Automation/WCP Wrapper class: Implements that UIAutomation I...Provider
-    // interface, and calls through to a WCP AutomationPeer which implements the corresponding
-    // I...Provider inteface. Marshalls the call from the RPC thread onto the
-    // target AutomationPeer's context.
-    //
-    // Class has two major parts to it:
-    // * Implementation of the I...Provider, which uses Dispatcher.Invoke
-    //   to call a private method (lives in second half of the class) via a delegate,
-    //   if necessary, packages any params into an object param. Return type of Invoke
-    //   must be cast from object to appropriate type.
-    // * private methods - one for each interface entry point - which get called back
-    //   on the right context. These call through to the peer that's actually
-    //   implenting the I...Provider version of the interface. 
-    internal class DockProviderWrapper: MarshalByRefObject, IDockProvider
-    {
-        //------------------------------------------------------
-        //
-        //  Constructors
-        //
-        //------------------------------------------------------
-
-        #region Constructors
-
-        private DockProviderWrapper( AutomationPeer peer, IDockProvider iface )
-        {
-            _peer = peer;
-            _iface = iface;
-        }
-
-        #endregion Constructors
-
-
-        //------------------------------------------------------
-        //
-        //  Interface IDockProvider
-        //
-        //------------------------------------------------------
-
-        #region Interface IDockProvider
-
-        public void SetDockPosition(DockPosition dockPosition)
-        {
-            ElementUtil.Invoke( _peer, new DispatcherOperationCallback( SetDockPosition ), dockPosition );
-        }
-
-        public DockPosition DockPosition
-        {
-            get
-            {
-                return (DockPosition)ElementUtil.Invoke(_peer, new DispatcherOperationCallback( GetDockPosition ), null);              
-            }
-        }
-
-        #endregion Interface IDockProvider
-
-
-        //------------------------------------------------------
-        //
-        //  Internal Methods
-        //
-        //------------------------------------------------------
-
-        #region Internal Methods
-
-        internal static object Wrap( AutomationPeer peer, object iface )
-        {
-            return new DockProviderWrapper( peer, (IDockProvider) iface );
-        }
+namespace MS.Internal.Automation;
 
-        #endregion Internal Methods
-
-        //------------------------------------------------------
-        //
-        //  Private Methods
-        //
-        //------------------------------------------------------
-
-        #region Private Methods
-
-        private object SetDockPosition( object arg )
-        {
-            _iface.SetDockPosition( (DockPosition) arg );
-            return null;
-        }
-
-        private object GetDockPosition( object unused )
-        {
-            return _iface.DockPosition;
-        }
+/// <summary>
+/// Wrapper class for the <see cref="IDockProvider"/> interface, calls through to the managed <see cref="AutomationPeer"/>
+/// that implements it. The calls are made on the peer's context to ensure that the correct synchronization context is used.
+/// </summary>
+internal sealed class DockProviderWrapper : MarshalByRefObject, IDockProvider
+{
+    private readonly AutomationPeer _peer;
+    private readonly IDockProvider _iface;
 
-        #endregion Private Methods
+    private DockProviderWrapper(AutomationPeer peer, IDockProvider iface)
+    {
+        Debug.Assert(peer is not null);
+        Debug.Assert(iface is not null);
 
+        _peer = peer;
+        _iface = iface;
+    }
 
-        //------------------------------------------------------
-        //
-        //  Private Fields
-        //
-        //------------------------------------------------------
-
-        #region Private Fields
+    public void SetDockPosition(DockPosition dockPosition)
+    {
+        ElementUtil.Invoke(_peer, static (state, dockPosition) => state.SetDockPosition(dockPosition), _iface, dockPosition);
+    }
 
-        private AutomationPeer _peer;
-        private IDockProvider _iface;
+    public DockPosition DockPosition
+    {
+        get => ElementUtil.Invoke(_peer, static (state) => state.DockPosition, _iface);
+    }
 
-        #endregion Private Fields
+    /// <summary>
+    /// Creates a wrapper for the given <see cref="AutomationPeer"/> and <see cref="IDockProvider"/> interface.
+    /// </summary>
+    internal static object Wrap(AutomationPeer peer, object iface)
+    {
+        return new DockProviderWrapper(peer, (IDockProvider)iface);
     }
 }