Merge pull request #20617 from unoplatform/mergify/bp/release/stable/6.0/pr-20557

fix(linux): only init DpiBootstrap on Windows (backport #20557)

Author: jeromelaban

src/SamplesApp/SamplesApp.Skia.Generic/Program.cs

@@ -56,23 +56,8 @@ private static void Run()
 						global::Uno.Foundation.Extensibility.ApiExtensibility.Register<Microsoft.Web.WebView2.Core.CoreWebView2>(typeof(Microsoft.Web.WebView2.Core.INativeWebViewProvider), o => new global::Uno.UI.WebView.Skia.X11.X11NativeWebViewProvider(o));
 					}
 				})
-				.UseX11(hostBuilder => hostBuilder.PreloadMediaPlayer(true));
-
-			if (OperatingSystem.IsWindows())
-			{
-				void Build()
-				{
-					// This is in a separate method to avoid loading the win32 uno runtime assembly
-					// This assumes that the runtime loads dependencies when entering the method.
-
-					builder = builder
-						.UseWin32(hostBuilder => hostBuilder.PreloadMediaPlayer(true));
-				}
-
-				Build();
-			}
-
-			builder = builder
+				.UseX11(hostBuilder => hostBuilder.PreloadMediaPlayer(true))
+				.UseWin32(hostBuilder => hostBuilder.PreloadMediaPlayer(true))
 				.UseWindows()
 				.UseLinuxFrameBuffer()
 				.UseWindows(b => b

src/Uno.Foundation.Logging/AssemblyInfo.cs

@@ -24,6 +24,7 @@
 [assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.MacOS")]
 [assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.Wpf")]
 [assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.Win32")]
+[assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.Win32.Support")]
 [assembly: InternalsVisibleTo("Uno.UI.Maps")]
 [assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.Tizen")]
 [assembly: InternalsVisibleTo("Uno.UI.Runtime.Skia.Linux.FrameBuffer")]

src/Uno.UI.Runtime.Skia.Win32/DpiBootstrap.cs renamed to src/Uno.UI.Runtime.Skia.Win32.Support/DpiBootstrap.cs

@@ -1,6 +1,11 @@
-using System.Runtime.CompilerServices;
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.System.Diagnostics.Debug;
 using Windows.Win32.UI.HiDpi;
+using Uno.Foundation.Logging;
 
 #pragma warning disable CA2255
 
@@ -31,6 +36,30 @@ internal static void Init()
 		//
 		// This call must be made BEFORE any window is initialized.
 
-		PInvoke.SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT.DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+		var success = PInvoke.SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT.DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+		if (!success) { typeof(DpiBootstrap).LogError()?.Error($"{nameof(PInvoke.AddClipboardFormatListener)} failed: {GetErrorMessage()}"); }
+	}
+
+	private static string GetErrorMessage() => GetErrorMessage((uint)Marshal.GetLastWin32Error());
+
+	private static unsafe string GetErrorMessage(uint errorCode)
+	{
+		IntPtr* messagePtr = stackalloc IntPtr[1];
+		var messageLength = PInvoke.FormatMessage(
+			FORMAT_MESSAGE_OPTIONS.FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_OPTIONS.FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_OPTIONS.FORMAT_MESSAGE_IGNORE_INSERTS,
+			default,
+			errorCode,
+			0,
+			new PWSTR((char*)messagePtr),
+			0);
+		var message = *messagePtr;
+		try
+		{
+			return Marshal.PtrToStringUni(message, (int)messageLength);
+		}
+		finally
+		{
+			PInvoke.LocalFree(new HLOCAL(message.ToPointer()));
+		}
 	}
 }

src/Uno.UI.Runtime.Skia.Win32.Support/Uno.UI.Runtime.Skia.Win32.Support.csproj

@@ -20,6 +20,10 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
+	<ItemGroup>
+		<ProjectReference Include="..\Uno.Foundation.Logging\Uno.Foundation.Logging.csproj" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
 	</ItemGroup>