Prevent ClipboarService from opening unnecessary handles. Clean up Wi…

…ndows desktop app startup process.
immense · Dec 16, 2020 · 8892f60 · 8892f60
1 parent 07517b0
commit 8892f60
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 67 deletions.
diff --git a/Desktop.Win/App.xaml b/Desktop.Win/App.xaml
@@ -2,7 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Remotely.Desktop.Win"
-             DispatcherUnhandledException="Application_DispatcherUnhandledException" Startup="Application_Startup" Exit="Application_Exit">
+             DispatcherUnhandledException="Application_DispatcherUnhandledException" Startup="Application_Startup">
     <Application.Resources>
         <Style x:Key="TitlebarButton" TargetType="Button">
             <Setter Property="Background" Value="#FF464646"></Setter>

diff --git a/Desktop.Win/App.xaml.cs b/Desktop.Win/App.xaml.cs
@@ -40,16 +40,5 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 Environment.Exit(0);
             }
         }
-
-        private void Application_Exit(object sender, ExitEventArgs e)
-        {
-            Task.Run(async () =>
-            {
-                var casterSocket = ServiceContainer.Instance.GetRequiredService<CasterSocket>();
-                await casterSocket.DisconnectAllViewers();
-                System.Windows.Forms.Application.Exit();
-                Environment.Exit(0);
-            });
-        }
     }
 }
diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -58,7 +58,7 @@ public static async Task Main(string[] args)
 
                 if (Conductor.Mode == Core.Enums.AppMode.Chat)
                 {
-                    StartUiThreads(null);
+                    StartUiThreads(false);
                     await Task.Run(async () =>
                     {
                         var chatService = Services.GetRequiredService<IChatHostService>();
@@ -67,7 +67,7 @@ public static async Task Main(string[] args)
                 }
                 else if (Conductor.Mode == Core.Enums.AppMode.Unattended)
                 {
-                    StartUiThreads(null);
+                    StartUiThreads(false);
                     App.Current.Dispatcher.Invoke(() =>
                     {
                         App.Current.ShutdownMode = ShutdownMode.OnExplicitShutdown;
@@ -76,12 +76,8 @@ public static async Task Main(string[] args)
                 }
                 else
                 {
-                    StartUiThreads(() => new MainWindow());
+                    StartUiThreads(true);
                 }
-
-                TaskHelper.DelayUntil(() => App.Current?.Dispatcher?.HasShutdownStarted != false,
-                    TimeSpan.MaxValue, 
-                    1000);
             }
             catch (Exception ex)
             {
@@ -177,19 +173,20 @@ private static async Task StartScreenCasting()
             Services.GetRequiredService<IClipboardService>().BeginWatching();
         }
 
-        private static void StartUiThreads(Func<Window> createWindowFunc)
+        private static void StartUiThreads(bool createMainWindow)
         {
             var wpfUiThread = new Thread(() =>
             {
                 var app = new App();
                 app.InitializeComponent();
-                if (createWindowFunc is null)
+
+                if (createMainWindow)
                 {
-                    app.Run();
+                    app.Run(new MainWindow());
                 }
                 else
                 {
-                    app.Run(createWindowFunc());
+                    app.Run();
                 }
             });
             wpfUiThread.TrySetApartmentState(ApartmentState.STA);
@@ -202,7 +199,7 @@ private static void StartUiThreads(Func<Window> createWindowFunc)
             winformsThread.TrySetApartmentState(ApartmentState.STA);
             winformsThread.Start();
 
-
+            // Wait until WPF app has initialized before moving on.
             while (App.Current is null)
             {
                 Thread.Sleep(100);

diff --git a/Desktop.Win/Services/ClipboardServiceWin.cs b/Desktop.Win/Services/ClipboardServiceWin.cs
@@ -26,7 +26,7 @@ public void BeginWatching()
             finally
             {
                 cancelTokenSource = new CancellationTokenSource();
-                _ = Task.Run(() => WatchClipboard(cancelTokenSource.Token));
+                WatchClipboard(cancelTokenSource.Token);
             }
         }
 
@@ -51,6 +51,7 @@ public Task SetText(string clipboardText)
                 }
             });
             thread.SetApartmentState(ApartmentState.STA);
+            thread.IsBackground = true;
             thread.Start();
 
             return Task.CompletedTask;
@@ -68,29 +69,30 @@ public void StopWatching()
 
         private void WatchClipboard(CancellationToken cancelToken)
         {
-            while (!cancelToken.IsCancellationRequested &&
-                !Environment.HasShutdownStarted)
+            var thread = new Thread(() =>
             {
-                var thread = new Thread(() =>
+
+                while (!cancelToken.IsCancellationRequested &&
+                    !Environment.HasShutdownStarted)
                 {
 
                     try
                     {
                         Win32Interop.SwitchToInputDesktop();
 
-
                         if (Clipboard.ContainsText() && Clipboard.GetText() != ClipboardText)
                         {
                             ClipboardText = Clipboard.GetText();
                             ClipboardTextChanged?.Invoke(this, ClipboardText);
                         }
                     }
                     catch { }
-                });
-                thread.SetApartmentState(ApartmentState.STA);
-                thread.Start();
-                Thread.Sleep(500);
-            }
+                    Thread.Sleep(500);
+                }
+            });
+            thread.SetApartmentState(ApartmentState.STA);
+            thread.IsBackground = true;
+            thread.Start();
         }
     }
 }
diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs
@@ -31,6 +31,11 @@ public MainWindowViewModel()
         {
             Current = this;
 
+            if (Services is null)
+            {
+                return;
+            }
+
             Application.Current.Exit += Application_Exit;
 
             CursorIconWatcher = Services?.GetRequiredService<ICursorIconWatcher>();
@@ -185,7 +190,6 @@ public async Task GetSessionID()
 
         public async Task Init()
         {
-
             SessionID = "Retrieving...";
 
             Host = Config.GetConfig().Host;

diff --git a/Desktop.Win/Views/MainWindow.xaml.cs b/Desktop.Win/Views/MainWindow.xaml.cs
@@ -1,5 +1,6 @@
 using Remotely.Desktop.Win.ViewModels;
 using System;
+using System.ComponentModel;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -56,7 +57,11 @@ private void OptionsButton_Click(object sender, RoutedEventArgs e)
 
         private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            await ViewModel?.Init();
+            if (!DesignerProperties.GetIsInDesignMode(this) &&
+                ViewModel != null)
+            {
+                await ViewModel?.Init();
+            }
         }
 
         private void Window_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)

diff --git a/Tests.LoadTester/Tests.LoadTester.csproj b/Tests.LoadTester/Tests.LoadTester.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
     <AssemblyName>Remotely.Tests.LoadTester</AssemblyName>
     <RootNamespace>Remotely.Tests.LoadTester</RootNamespace>
   </PropertyGroup>
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\Desktop.Win\Desktop.Win.csproj" />
     <ProjectReference Include="..\Shared\Shared.csproj" />
   </ItemGroup>
 

diff --git a/Tests/ManaulTests.cs b/Tests/ManaulTests.cs
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net5.0-windows</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Desktop.Core\Desktop.Core.csproj" />
+    <ProjectReference Include="..\Desktop.Win\Desktop.Win.csproj" />
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>