dded optional console + logging; attempted to fix crash in

ScreenPropertyChanged

Author: lostmsu

src/App/App.csproj

@@ -68,7 +68,13 @@
     <PackageReference Include="LostTech.VirtualDesktop" Version="0.0.8-pre0" />
     <PackageReference Include="MahApps.Metro" Version="1.6.5" />
     <PackageReference Include="ManagedShell" Version="0.0.196" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.12.19" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.183">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="PInvoke.User32" Version="0.7.124" />

src/App/App.xaml.cs

@@ -1,18 +1,14 @@
 namespace LostTech.Stack
 {
-    using System;
-    using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Collections.Specialized;
     using System.Drawing;
     using System.Diagnostics;
     using System.IO;
-    using System.Linq;
     using System.Reflection;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
     using System.Threading;
-    using System.Threading.Tasks;
     using System.Windows;
     using System.Windows.Forms;
     using System.Windows.Interop;
@@ -88,12 +84,26 @@ public partial class App : BoilerplateApp, ILayoutsViewModel, IServiceProvider
         int sessionLocked;
         bool SessionLocked => this.sessionLocked != 0;
         readonly Win32WindowFactory win32WindowFactory = new Win32WindowFactory();
+        readonly Thread uiThread = Thread.CurrentThread;
+        readonly Microsoft.Extensions.Hosting.IHost host;
+        readonly ILogger<App> log;
 
         public event EventHandler<EventArgs<ScreenLayout>> LayoutLoaded;
 
         internal static readonly bool IsUwp = new DesktopBridge.Helpers().IsRunningAsUwp();
 
         public App() {
+            if (Environment.GetEnvironmentVariable("STACK_CONSOLE") == "1") {
+                try {
+                    ConsoleWindow.Setup();
+                } catch (Exception e) {
+                    Debug.WriteLine(e.ToString());
+                }
+            }
+
+            var builder = Microsoft.Extensions.Hosting.Host.CreateApplicationBuilder([]);
+            this.host = builder.Build();
+            this.log = this.host.Services.GetRequiredService<ILogger<App>>();
             this.screenProvider = new Win32ScreenProvider(a => this.Dispatcher.BeginInvoke(a));
         }
 
@@ -594,9 +604,10 @@ async Task StartLayout(StackSettings settings)
                 old.PropertyChanged -= ScreenPropertyChanged;
                 @new.PropertyChanged += ScreenPropertyChanged;
                 ScreenLayout layout = this.screenLayouts.FirstOrDefault(l => l.Screen?.ID == old.ID);
-                if (layout != null)
+                if (layout != null) {
+                    this.log.LogWarning("Old screen not found: {Old} -> {New}", old, @new);
                     layout.ViewModel.Screen = @new;
-                else {
+                }  else {
                     RemoveLayoutForScreen(old);
                     await AddLayoutForScreen(@new);
                 }
@@ -655,6 +666,10 @@ async void LayoutBoundsChanged(object sender, EventArgs e) {
         }
 
         async void ScreenPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
+            await this.Dispatcher;
+
+            if (this.uiThread.ManagedThreadId != Thread.CurrentThread.ManagedThreadId)
+                throw new InvalidProgramException("not on UI thread");
             var screen = (Win32Screen)sender;
             switch (e.PropertyName) {
             case nameof(Win32Screen.WorkingArea):

src/App/GlobalUsings.cs

@@ -0,0 +1,11 @@
+global using System;
+global using System.Collections.Generic;
+global using System.Diagnostics;
+global using System.Linq;
+global using System.Threading.Tasks;
+
+global using Microsoft.Extensions.DependencyInjection;
+global using Microsoft.Extensions.Logging;
+global using Microsoft.VisualStudio.Threading;
+
+global using static System.FormattableString;

src/App/NativeMethods.txt

@@ -0,0 +1,4 @@
+AllocConsole
+ATTACH_PARENT_PROCESS
+AttachConsole
+WIN32_ERROR

src/App/Utils/ConsoleWindow.cs

@@ -0,0 +1,28 @@
+namespace LostTech.Stack.Utils;
+
+using System.ComponentModel;
+
+using global::Windows.Win32.Foundation;
+
+using static global::Windows.Win32.PInvoke;
+
+static class ConsoleWindow {
+    public static void Setup() {
+        if (AttachConsole(ATTACH_PARENT_PROCESS))
+            return;
+
+        var ex = new Win32Exception();
+        var error = (WIN32_ERROR)ex.NativeErrorCode;
+
+        if (error is WIN32_ERROR.ERROR_ACCESS_DENIED
+                  or WIN32_ERROR.ERROR_INVALID_PARAMETER
+                  or WIN32_ERROR.ERROR_INVALID_HANDLE) {
+            if (!AllocConsole())
+                throw new Win32Exception();
+            else
+                return;
+        }
+
+        throw ex;
+    }
+}

src/App/Utils/DispatcherExtensions.cs

@@ -0,0 +1,20 @@
+namespace LostTech.Stack.Utils;
+using System.Runtime.CompilerServices;
+using System.Windows.Threading;
+using System;
+
+static class DispatcherExtensions {
+    public static DispatcherAwaiter GetAwaiter(this Dispatcher dispatcher) => new(dispatcher);
+
+    public class DispatcherAwaiter(Dispatcher dispatcher): INotifyCompletion {
+        private readonly Dispatcher dispatcher = dispatcher ?? throw new ArgumentNullException(nameof(dispatcher));
+
+        public bool IsCompleted => this.dispatcher.CheckAccess();
+
+        public void GetResult() { }
+
+        public void OnCompleted(Action continuation) {
+            this.dispatcher.BeginInvoke(continuation);
+        }
+    }
+}