Move the Direct2D factory to Application

Also use the new calling convention syntax for the CsWin32 workaround

Author: JeremyKuhne

src/samples/DirectDraw/Direct2dDemo/Program.cs

@@ -75,6 +75,7 @@ protected override LRESULT WindowProcedure(HWND window, MessageType message, WPA
                         renderTarget.FillRectangle(rectangle1, _lightSlateGrayBrush!);
                         renderTarget.DrawRectangle(rectangle2, _cornflowerBlueBrush!);
                     }
+
                     return (LRESULT)0;
             }
 

src/thirtytwo/Application.cs

@@ -4,12 +4,15 @@
 using System.Drawing;
 using System.Runtime.InteropServices;
 using Windows.Support;
+using Windows.Win32.Graphics.Direct2D;
 
 namespace Windows;
 
 public static unsafe class Application
 {
     private static ActivationContext? s_visualStylesContext;
+    private static Factory? s_direct2dFactory;
+
     internal static ActivationScope ThemingScope => new(GetStylesContext());
 
     internal static void EnsureDpiAwareness()
@@ -203,4 +206,6 @@ public static void EnumerateThreadWindows(
     {
         using var enumerator = new ThreadWindowEnumerator(threadId, callback);
     }
+
+    public static Factory Direct2dFactory => s_direct2dFactory ??= new();
 }

src/thirtytwo/Win32/Graphics/Direct2D/ID2D1RenderTarget.cs

@@ -10,7 +10,6 @@ public unsafe partial struct ID2D1RenderTarget
 {
     public D2D_SIZE_F GetSizeHack()
     {
-        D2D_SIZE_F result;
-        return *((delegate* unmanaged<ID2D1RenderTarget*, D2D_SIZE_F*, D2D_SIZE_F*>)lpVtbl[53])((ID2D1RenderTarget*)Unsafe.AsPointer(ref this), &result);
+        return ((delegate* unmanaged[Stdcall, MemberFunction]<ID2D1RenderTarget*, D2D_SIZE_F>)lpVtbl[53])((ID2D1RenderTarget*)Unsafe.AsPointer(ref this));
     }
 }

src/thirtytwo/Window.cs

@@ -15,7 +15,7 @@ public unsafe class Window : ComponentBase, IHandle<HWND>, ILayoutHandler
     private static readonly object s_lock = new();
     private static readonly ConcurrentDictionary<HWND, WeakReference<Window>> s_windows = new();
     private static readonly WindowClass s_defaultWindowClass = new(className: $"DefaultWindowClass_{Guid.NewGuid()}");
-    protected static Factory? Direct2dFactory { get; private set; }
+
     public static Rectangle DefaultBounds { get; }
         = new(Interop.CW_USEDEFAULT, Interop.CW_USEDEFAULT, Interop.CW_USEDEFAULT, Interop.CW_USEDEFAULT);
 
@@ -72,10 +72,10 @@ protected bool IsDirect2dEnabled([NotNullWhen(true)] out HwndRenderTarget? rende
         return IsDirect2dEnabled();
     }
 
-/// <summary>
-///  The window handle. This will be <see cref="HWND.Null"/> after the window is destroyed.
-/// </summary>
-public HWND Handle => _handle;
+    /// <summary>
+    ///  The window handle. This will be <see cref="HWND.Null"/> after the window is destroyed.
+    /// </summary>
+    public HWND Handle => _handle;
 
     public event WindowsMessageEvent? MessageHandler;
 
@@ -101,11 +101,6 @@ public Window(
         _text = text;
         _features = features;
 
-        if (_features.AreFlagsSet(Features.EnableDirect2d))
-        {
-            Direct2dFactory ??= new();
-        }
-
         try
         {
             _handle = _windowClass.CreateWindow(
@@ -194,14 +189,9 @@ public void SetFont(string typeFace, int pointSize)
     [MemberNotNull(nameof(Direct2dRenderTarget))]
     private void UpdateRenderTarget(HWND window, Size size)
     {
-        if (Direct2dFactory is null)
-        {
-            throw new InvalidOperationException("Should never call UpdateRenderTarget without a factory.");
-        }
-
         if (Direct2dRenderTarget is null)
         {
-            Direct2dRenderTarget = HwndRenderTarget.CreateForWindow(Direct2dFactory, window, size);
+            Direct2dRenderTarget = HwndRenderTarget.CreateForWindow(Application.Direct2dFactory, window, size);
             RenderTargetCreated(Direct2dRenderTarget);
         }
         else