Fix AOT incompatible code

Use code patterns which are AOT-friendly. That improves R2R and Native AOT scenarios
AvaloniaUI · Feb 5, 2022 · 0f1484d · 0f1484d
1 parent fb7cf3d
commit 0f1484d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/src/Avalonia.MicroCom/MicroComVtblBase.cs b/src/Avalonia.MicroCom/MicroComVtblBase.cs
@@ -16,16 +16,23 @@ public unsafe class MicroComVtblBase
         public static IntPtr Vtable { get; } = new MicroComVtblBase().CreateVTable();
         public MicroComVtblBase()
         {
-            AddMethod((QueryInterfaceDelegate)QueryInterface);
-            AddMethod((AddRefDelegate)AddRef);
-            AddMethod((AddRefDelegate)Release);
+            AddMethod<QueryInterfaceDelegate>(QueryInterface);
+            AddMethod<AddRefDelegate>(AddRef);
+            AddMethod<AddRefDelegate>(Release);
         }
 
         protected void AddMethod(void* f)
         {
             _methods.Add(new IntPtr(f));
         }
 
+        protected void AddMethod<TDelegate>(TDelegate d)
+            where TDelegate : notnull
+        {
+            GCHandle.Alloc(d);
+            _methods.Add(Marshal.GetFunctionPointerForDelegate(d));
+        }
+
         protected void AddMethod(Delegate d)
         {
             GCHandle.Alloc(d);

diff --git a/src/Avalonia.X11/NativeDialogs/Gtk.cs b/src/Avalonia.X11/NativeDialogs/Gtk.cs
@@ -63,7 +63,7 @@ public void Dispose()
         public static IDisposable ConnectSignal<T>(IntPtr obj, string name, T handler)
         {
             var handle = GCHandle.Alloc(handler);
-            var ptr = Marshal.GetFunctionPointerForDelegate((Delegate)(object)handler);
+            var ptr = Marshal.GetFunctionPointerForDelegate<T>(handler);
             using (var utf = new Utf8Buffer(name))
             {
                 var id = g_signal_connect_object(obj, utf, ptr, IntPtr.Zero, 0);

diff --git a/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs b/src/Windows/Avalonia.Win32/Interop/UnmanagedMethods.cs
@@ -862,7 +862,7 @@ public struct BITMAPINFOHEADER
 
             public void Init()
             {
-                biSize = (uint)Marshal.SizeOf(this);
+                biSize = (uint)sizeof(BITMAPINFOHEADER);
             }
         }
 
@@ -1521,7 +1521,7 @@ internal struct RTL_OSVERSIONINFOEX
         internal static Version RtlGetVersion()
         {
             RTL_OSVERSIONINFOEX v = new RTL_OSVERSIONINFOEX();
-            v.dwOSVersionInfoSize = (uint)Marshal.SizeOf(v);
+            v.dwOSVersionInfoSize = (uint)Marshal.SizeOf<RTL_OSVERSIONINFOEX>();
             if (RtlGetVersion(ref v) == 0)
             {
                 return new Version((int)v.dwMajorVersion, (int)v.dwMinorVersion, (int)v.dwBuildNumber);
@@ -1914,7 +1914,7 @@ public static WINDOWPLACEMENT Default
                 get
                 {
                     WINDOWPLACEMENT result = new WINDOWPLACEMENT();
-                    result.Length = Marshal.SizeOf(result);
+                    result.Length = Marshal.SizeOf<WINDOWPLACEMENT>();
                     return result;
                 }
             }

diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs
@@ -228,7 +228,7 @@ public Size? FrameSize
                     return new Size(rcWindow.Width, rcWindow.Height) / RenderScaling;
                 }
 
-                DwmGetWindowAttribute(_hwnd, (int)DwmWindowAttribute.DWMWA_EXTENDED_FRAME_BOUNDS, out var rect, Marshal.SizeOf(typeof(RECT)));
+                DwmGetWindowAttribute(_hwnd, (int)DwmWindowAttribute.DWMWA_EXTENDED_FRAME_BOUNDS, out var rect, Marshal.SizeOf<RECT>()));
                 return new Size(rect.Width, rect.Height) / RenderScaling;
             }
         }
@@ -337,7 +337,7 @@ private WindowTransparencyLevel Win7EnableBlur(WindowTransparencyLevel transpare
         private WindowTransparencyLevel Win8xEnableBlur(WindowTransparencyLevel transparencyLevel)
         {
             var accent = new AccentPolicy();
-            var accentStructSize = Marshal.SizeOf(accent);
+            var accentStructSize = Marshal.SizeOf<AccentPolicy>();
 
             if (transparencyLevel == WindowTransparencyLevel.AcrylicBlur)
             {
@@ -392,7 +392,7 @@ private WindowTransparencyLevel Win10EnableBlur(WindowTransparencyLevel transpar
                 bool canUseAcrylic = Win32Platform.WindowsVersion.Major > 10 || Win32Platform.WindowsVersion.Build >= 19628;
 
                 var accent = new AccentPolicy();
-                var accentStructSize = Marshal.SizeOf(accent);
+                var accentStructSize = Marshal.SizeOf<AccentPolicy>();
 
                 if (transparencyLevel == WindowTransparencyLevel.AcrylicBlur && !canUseAcrylic)
                 {