Merge branch 'master' into fixes/controlCodepoint

Gillibald · web-flow · commit e88f97200214 · 2024-09-25T15:13:51.000+02:00
diff --git a/build/TrimmingEnable.props b/build/TrimmingEnable.props
@@ -19,4 +19,10 @@
     <WarningsAsErrors Condition="'$(IsAotCompatible)' == 'true'">$(WarningsAsErrors);IL3050;IL3051;IL3052;IL3053;IL3054;IL3055;IL3056</WarningsAsErrors>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND '$(EnableRuntimeMarshalling)' != 'true'">
+    <WarningsAsErrors>$(WarningsAsErrors);CA1420;CA1421</WarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) AND '$(EnableRuntimeMarshalling)' != 'true'">
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.DisableRuntimeMarshallingAttribute" />
+  </ItemGroup>
 </Project>
diff --git a/packages/Avalonia/AvaloniaBuildTasks.targets b/packages/Avalonia/AvaloniaBuildTasks.targets
@@ -174,6 +174,12 @@
       <_AvaloniaXamlCompiledSymbols Include="@(_DebugSymbolsIntermediatePath->Metadata('AvaloniaCompileOutput'))"/>
       <_DebugSymbolsIntermediatePath Remove="@(_DebugSymbolsIntermediatePath)"/>
       <_DebugSymbolsIntermediatePath Include="@(_AvaloniaXamlCompiledSymbols)"/>
+      
+      <!-- ClickOnce takes a copy of @(IntermediateAssembly) during the evaluation phase -->
+      <_DeploymentManifestEntryPoint Remove="@(_DeploymentManifestEntryPoint)" />
+      <_DeploymentManifestEntryPoint Include="@(_AvaloniaXamlCompiledAssembly)">
+        <TargetPath>$(TargetFileName)</TargetPath>
+      </_DeploymentManifestEntryPoint>
     </ItemGroup>
   </Target>
 
diff --git a/src/Android/Avalonia.Android/Avalonia.Android.csproj b/src/Android/Avalonia.Android/Avalonia.Android.csproj
@@ -4,6 +4,7 @@
     <SupportedOSPlatformVersion>$(AvsMinSupportedAndroidVersion)</SupportedOSPlatformVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AndroidResgenNamespace>Avalonia.Android.Internal</AndroidResgenNamespace>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/AndroidFramebuffer.cs
@@ -6,7 +6,7 @@
 
 namespace Avalonia.Android.Platform.SkiaPlatform
 {
-    class AndroidFramebuffer : ILockedFramebuffer
+    unsafe class AndroidFramebuffer : ILockedFramebuffer
     {
         private IntPtr _window;
 
@@ -24,7 +24,7 @@ public AndroidFramebuffer(Surface surface, double scaling)
                 bottom = ANativeWindow_getHeight(_window)
             };
             Size = new PixelSize(rc.right, rc.bottom);
-            ANativeWindow_lock(_window, out buffer, ref rc);
+            ANativeWindow_lock(_window, &buffer, &rc);
 
             Format = buffer.format == AndroidPixelFormat.WINDOW_FORMAT_RGB_565
                 ? PixelFormat.Rgb565 : PixelFormat.Rgba8888;
@@ -61,7 +61,7 @@ public void Dispose()
         internal static extern void ANativeWindow_unlockAndPost(IntPtr window);
 
         [DllImport("android")]
-        internal static extern int ANativeWindow_lock(IntPtr window, out ANativeWindow_Buffer outBuffer, ref ARect inOutDirtyBounds);
+        internal static extern int ANativeWindow_lock(IntPtr window, ANativeWindow_Buffer* outBuffer, ARect* inOutDirtyBounds);
         public enum AndroidPixelFormat
         {
             WINDOW_FORMAT_RGBA_8888 = 1,
diff --git a/src/Android/Avalonia.Android/Platform/Vulkan/VulkanSupport.cs b/src/Android/Avalonia.Android/Platform/Vulkan/VulkanSupport.cs
@@ -6,10 +6,10 @@
 
 namespace Avalonia.Android.Platform.Vulkan
 {
-    internal class VulkanSupport
+    internal partial class VulkanSupport
     {
-        [DllImport("libvulkan.so")]
-        private static extern IntPtr vkGetInstanceProcAddr(IntPtr instance, string name);
+        [LibraryImport("libvulkan.so", StringMarshalling = StringMarshalling.Utf8)]
+        private static partial IntPtr vkGetInstanceProcAddr(IntPtr instance, string name);
 
         public static VulkanPlatformGraphics? TryInitialize(VulkanOptions options) =>
             VulkanPlatformGraphics.TryCreate(options ?? new(), new VulkanPlatformSpecificOptions
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -5,7 +5,6 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
     <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
-    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Assets\*.trie" />
diff --git a/src/Avalonia.Base/Media/Imaging/PixelFormatTranscoder.cs b/src/Avalonia.Base/Media/Imaging/PixelFormatTranscoder.cs
@@ -18,7 +18,7 @@ public static void Transcode(
         AlphaFormat destAlphaFormat)
     {
         var pixelCount = srcSize.Width * srcSize.Height;
-        var bufferSize = pixelCount * Marshal.SizeOf<Rgba8888Pixel>();
+        var bufferSize = pixelCount * sizeof(Rgba8888Pixel);
         using var blob = new UnmanagedBlob(bufferSize);
       
         var pixels = new Span<Rgba8888Pixel>((void*)blob.Address, pixelCount);
diff --git a/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs b/src/Avalonia.Base/Platform/Internal/UnmanagedBlob.cs
@@ -3,6 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Avalonia.Compatibility;
 
 namespace Avalonia.Platform.Internal;
 
@@ -108,21 +109,15 @@ public void Dispose()
     public int Size { get; private set; }
     public bool IsDisposed { get; private set; }
 
-    [DllImport("libc", SetLastError = true)]
+    [DllImport("libc")]
     private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);
-    [DllImport("libc", SetLastError = true)]
+    [DllImport("libc")]
     private static extern int munmap(IntPtr addr, IntPtr length);
-    [DllImport("libc", SetLastError = true)]
-    private static extern long sysconf(int name);
-
-    private bool? _useMmap;
-    private bool UseMmap
-        => _useMmap ?? ((_useMmap = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)).Value);
 
     // Could be replaced with https://github.com/dotnet/runtime/issues/40892 when it will be available.
     private IntPtr Alloc(int size)
     {
-        if (!UseMmap)
+        if (!OperatingSystemEx.IsLinux())
         {
             return Marshal.AllocHGlobal(size);
         }
@@ -131,25 +126,33 @@ private IntPtr Alloc(int size)
             var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);
             if (rv.ToInt64() == -1 || (ulong)rv.ToInt64() == 0xffffffff)
             {
-                var errno = Marshal.GetLastWin32Error();
+#if NET6_0_OR_GREATER
+                var errno = Marshal.GetLastSystemError();
                 throw new Exception("Unable to allocate memory: " + errno);
+#else
+                throw new Exception("Unable to allocate memory");
+#endif
             }
             return rv;
         }
     }
 
     private void Free(IntPtr ptr, int len)
     {
-        if (!UseMmap)
+        if (!OperatingSystemEx.IsLinux())
         {
             Marshal.FreeHGlobal(ptr);
         }
         else
         {
             if (munmap(ptr, new IntPtr(len)) == -1)
             {
-                var errno = Marshal.GetLastWin32Error();
+#if NET6_0_OR_GREATER
+                var errno = Marshal.GetLastSystemError();
                 throw new Exception("Unable to free memory: " + errno);
+#else
+                throw new Exception("Unable to free memory");
+#endif
             }
         }
     }
diff --git a/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj b/src/Avalonia.FreeDesktop/Avalonia.FreeDesktop.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
     <Nullable>enable</Nullable>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
   </PropertyGroup>
 
   <Import Project="../../build/TrimmingEnable.props" />
diff --git a/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj b/src/Avalonia.OpenGL/Avalonia.OpenGL.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Avalonia.Vulkan/Avalonia.Vulkan.csproj b/src/Avalonia.Vulkan/Avalonia.Vulkan.csproj
@@ -3,6 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/Avalonia.X11/Avalonia.X11.csproj b/src/Avalonia.X11/Avalonia.X11.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Browser/Avalonia.Browser/Rendering/BrowserWebGlRenderTarget.cs b/src/Browser/Avalonia.Browser/Rendering/BrowserWebGlRenderTarget.cs
@@ -96,8 +96,8 @@ partial class WebGlContext : IGlContext, Avalonia.Skia.IGlSkiaSpecificOptionsFea
     [JSImport("WebGlRenderTarget.makeContextCurrent", AvaloniaModule.MainModuleName)]
     private static partial bool MakeContextCurrent(int context);
 
-    [DllImport("libSkiaSharp", EntryPoint = "eglGetProcAddress")]
-    private static extern IntPtr eglGetProcAddress(string name);
+    [LibraryImport("libSkiaSharp", EntryPoint = "eglGetProcAddress", StringMarshalling = StringMarshalling.Utf8)]
+    private static partial IntPtr eglGetProcAddress(string name);
 
     private int _contextId;
     private readonly Thread _thread;
@@ -177,4 +177,4 @@ public void Dispose()
         throw new NotSupportedException();
 
     public bool UseNativeSkiaGrGlInterface => true;
-}
+}
diff --git a/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj b/src/Linux/Avalonia.LinuxFramebuffer/Avalonia.LinuxFramebuffer.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
diff --git a/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalApi.cs b/src/Skia/Avalonia.Skia/Gpu/Metal/SkiaMetalApi.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Avalonia.Compatibility;
 using Avalonia.Platform.Interop;
@@ -77,13 +78,18 @@ public GRContext CreateContext(IntPtr device, IntPtr queue, GRContextOptions? op
     {
         options ??= new();
         var nativeOptions = _contextOptionsToNative.Invoke(options, null)!;
-        var pOptions = Marshal.AllocHGlobal(Marshal.SizeOf(nativeOptions));
-        Marshal.StructureToPtr(nativeOptions, pOptions, false);
-        var context = _gr_direct_context_make_metal_with_options(device, queue, pOptions);
-        Marshal.FreeHGlobal(pOptions);
-        if (context == IntPtr.Zero)
-            throw new InvalidOperationException("Unable to create GRContext from Metal device.");
-        return (GRContext)_contextCtor.Invoke(new object[] { context, true });
+        var gcHandle = GCHandle.Alloc(nativeOptions, GCHandleType.Pinned);
+        try
+        {
+            var context = _gr_direct_context_make_metal_with_options(device, queue, gcHandle.AddrOfPinnedObject());
+            if (context == IntPtr.Zero)
+                throw new InvalidOperationException("Unable to create GRContext from Metal device.");
+            return (GRContext)_contextCtor.Invoke(new object[] { context, true });
+        }
+        finally
+        {
+            gcHandle.Free();   
+        }
     }
 
     internal struct GRMtlTextureInfoNative
diff --git a/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj b/src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(AvsCurrentTargetFramework);$(AvsLegacyTargetFrameworks);netstandard2.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <EnableRuntimeMarshalling>true</EnableRuntimeMarshalling>
     <!-- We still keep BinaryFormatter for WinForms compatibility. -->
     <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`
`7`	`7`	`namespace Avalonia.Android.Platform.Vulkan`
`8`	`8`	`{`
`9`		`- internal class VulkanSupport`
	`9`	`+ internal partial class VulkanSupport`
`10`	`10`	`{`
`11`		`- [DllImport("libvulkan.so")]`
`12`		`- private static extern IntPtr vkGetInstanceProcAddr(IntPtr instance, string name);`
	`11`	`+ [LibraryImport("libvulkan.so", StringMarshalling = StringMarshalling.Utf8)]`
	`12`	`+ private static partial IntPtr vkGetInstanceProcAddr(IntPtr instance, string name);`
`13`	`13`
`14`	`14`	`public static VulkanPlatformGraphics? TryInitialize(VulkanOptions options) =>`
`15`	`15`	`VulkanPlatformGraphics.TryCreate(options ?? new(), new VulkanPlatformSpecificOptions`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static void Transcode(`
`18`	`18`	`AlphaFormat destAlphaFormat)`
`19`	`19`	`{`
`20`	`20`	`var pixelCount = srcSize.Width * srcSize.Height;`
`21`		`- var bufferSize = pixelCount * Marshal.SizeOf<Rgba8888Pixel>();`
	`21`	`+ var bufferSize = pixelCount * sizeof(Rgba8888Pixel);`
`22`	`22`	`using var blob = new UnmanagedBlob(bufferSize);`
`23`	`23`
`24`	`24`	`var pixels = new Span<Rgba8888Pixel>((void*)blob.Address, pixelCount);`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Runtime.CompilerServices;`
`4`	`4`	`using System.Runtime.InteropServices;`
`5`	`5`	`using System.Threading;`
	`6`	`+using Avalonia.Compatibility;`
`6`	`7`
`7`	`8`	`namespace Avalonia.Platform.Internal;`
`8`	`9`
`@@ -108,21 +109,15 @@ public void Dispose()`
`108`	`109`	`public int Size { get; private set; }`
`109`	`110`	`public bool IsDisposed { get; private set; }`
`110`	`111`
`111`		`- [DllImport("libc", SetLastError = true)]`
	`112`	`+ [DllImport("libc")]`
`112`	`113`	`private static extern IntPtr mmap(IntPtr addr, IntPtr length, int prot, int flags, int fd, IntPtr offset);`
`113`		`- [DllImport("libc", SetLastError = true)]`
	`114`	`+ [DllImport("libc")]`
`114`	`115`	`private static extern int munmap(IntPtr addr, IntPtr length);`
`115`		`- [DllImport("libc", SetLastError = true)]`
`116`		`- private static extern long sysconf(int name);`
`117`		`-`
`118`		`- private bool? _useMmap;`
`119`		`- private bool UseMmap`
`120`		`- => _useMmap ?? ((_useMmap = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)).Value);`
`121`	`116`
`122`	`117`	`// Could be replaced with https://github.com/dotnet/runtime/issues/40892 when it will be available.`
`123`	`118`	`private IntPtr Alloc(int size)`
`124`	`119`	`{`
`125`		`- if (!UseMmap)`
	`120`	`+ if (!OperatingSystemEx.IsLinux())`
`126`	`121`	`{`
`127`	`122`	`return Marshal.AllocHGlobal(size);`
`128`	`123`	`}`
`@@ -131,25 +126,33 @@ private IntPtr Alloc(int size)`
`131`	`126`	`var rv = mmap(IntPtr.Zero, new IntPtr(size), 3, 0x22, -1, IntPtr.Zero);`
`132`	`127`	`if (rv.ToInt64() == -1 \|\| (ulong)rv.ToInt64() == 0xffffffff)`
`133`	`128`	`{`
`134`		`- var errno = Marshal.GetLastWin32Error();`
	`129`	`+#if NET6_0_OR_GREATER`
	`130`	`+ var errno = Marshal.GetLastSystemError();`
`135`	`131`	`throw new Exception("Unable to allocate memory: " + errno);`
	`132`	`+#else`
	`133`	`+ throw new Exception("Unable to allocate memory");`
	`134`	`+#endif`
`136`	`135`	`}`
`137`	`136`	`return rv;`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`
`141`	`140`	`private void Free(IntPtr ptr, int len)`
`142`	`141`	`{`
`143`		`- if (!UseMmap)`
	`142`	`+ if (!OperatingSystemEx.IsLinux())`
`144`	`143`	`{`
`145`	`144`	`Marshal.FreeHGlobal(ptr);`
`146`	`145`	`}`
`147`	`146`	`else`
`148`	`147`	`{`
`149`	`148`	`if (munmap(ptr, new IntPtr(len)) == -1)`
`150`	`149`	`{`
`151`		`- var errno = Marshal.GetLastWin32Error();`
	`150`	`+#if NET6_0_OR_GREATER`
	`151`	`+ var errno = Marshal.GetLastSystemError();`
`152`	`152`	`throw new Exception("Unable to free memory: " + errno);`
	`153`	`+#else`
	`154`	`+ throw new Exception("Unable to free memory");`
	`155`	`+#endif`
`153`	`156`	`}`
`154`	`157`	`}`
`155`	`158`	`}`