We should include this first

.github/actions/spell-check/expect.txt

@@ -27,7 +27,7 @@ admx
 advancedpaste
 advancedpasteui
 advancedpasteuishortcut
-advapi
+advapi32
 advfirewall
 AFeature
 affordances

.pipelines/v2/ci-nightly.yml

@@ -0,0 +1,38 @@
+# .pipelines/v2/nightly-prewarm.yml
+# Nightly pre-warm that reuses your existing ci.yml as-is
+
+trigger: none
+pr: none
+
+# (18:00 UTC) — adjust as you like
+schedules:
+  - cron: "0 18 * * *"   # UTC
+    displayName: Nightly pre-warm (main)
+    branches:
+      include:
+        - main
+    always: true
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: true
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    displayName: "MSBuild Cache Read Only"
+    default: false
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}

.pipelines/v2/ci.yml

@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"

.pipelines/v2/templates/job-build-project.yml

@@ -50,6 +50,9 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    default: true
   - name: runTests
     type: boolean
     default: true
@@ -154,6 +157,11 @@ jobs:
         $MSBuildCacheParameters += " -reportfileaccesses"
         $MSBuildCacheParameters += " -p:MSBuildCacheEnabled=true"
         $MSBuildCacheParameters += " -p:MSBuildCacheLogDirectory=$(LogOutputDirectory)\MSBuildCacheLogs"
+        # Cache read-only policy controlled by parameter
+        $cacheIsReadOnly = "${{ parameters.msBuildCacheIsReadOnly }}"
+        if ($cacheIsReadOnly -eq "True") {
+          $MSBuildCacheParameters += " /p:MSBuildCacheRemoteCacheIsReadOnly=true"
+        }
         Write-Host "MSBuildCacheParameters: $MSBuildCacheParameters"
         Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
       displayName: Prepare MSBuildCache variables
@@ -418,7 +426,7 @@ jobs:
       }
       
       if ($Packages.Count -gt 0) {
-          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fall back to any
+          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fallback to any
           $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
           if ($PlatformPackage) {
               $Package = $PlatformPackage

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -13,6 +13,9 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    default: true
   - name: runTests
     type: boolean
     default: true
@@ -52,6 +55,7 @@ stages:
             buildConfigurations: [Release]
             enablePackageCaching: true
             enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+            msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}
             runTests: ${{ parameters.runTests }}
             useVSPreview: ${{ parameters.useVSPreview }}
             useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -33,7 +33,6 @@ namespace
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
     const wchar_t JSON_KEY_GLIDE_TRAVEL_SPEED[] = L"gliding_travel_speed";
     const wchar_t JSON_KEY_GLIDE_DELAY_SPEED[] = L"gliding_delay_speed";
-    const wchar_t JSON_KEY_GLIDING_CURSOR_ENABLED[] = L"gliding_cursor_enabled";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -107,9 +106,6 @@ private:
     // Gliding cursor state machine
     std::atomic<int> m_glideState{ 0 }; // 0..4 like the AHK script
 
-    // Gliding cursor enabled state
-    bool m_glidingCursorEnabled = true;
-
     // Timer configuration: 10ms tick, speeds are defined per 200ms base window
     static constexpr int kTimerTickMs = 10;
     static constexpr int kBaseSpeedTickMs = 200; // mapping period for configured pixel counts
@@ -391,11 +387,6 @@ private:
 
     void HandleGlidingHotkey()
     {
-        if (!m_glidingCursorEnabled)
-        {
-            return;
-        }
-        
         auto s = m_state;
         if (!s)
         {
@@ -743,17 +734,6 @@ private:
                     m_state->slowVSpeed = 5;
                 }
             }
-            try
-            {
-                // Parse Gliding Cursor Enabled
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDING_CURSOR_ENABLED);
-                m_glidingCursorEnabled = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
-            }
-            catch (...)
-            {
-                Logger::info("Failed to initialize gliding cursor enabled from settings. Using default true.");
-                m_glidingCursorEnabled = true;
-            }
         }
         else
         {

src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs

@@ -0,0 +1,284 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Security.Cryptography;
+using System.Threading;
+
+// <summary>
+//     Initialization and clean up.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using Microsoft.Win32;
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+using MouseWithoutBorders.Form;
+using Windows.UI.Input.Preview.Injection;
+
+using Thread = MouseWithoutBorders.Core.Thread;
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+        private static bool initDone;
+        internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
+        internal static int REOPEN_WHEN_HOTKEY = -10055;
+        internal static int PleaseReopenSocket;
+        internal static bool ReopenSocketDueToReadError;
+
+        internal static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
+
+        internal static bool InitDone
+        {
+            get => Common.initDone;
+            set => Common.initDone = value;
+        }
+
+        internal static void UpdateMachineTimeAndID()
+        {
+            Common.MachineName = Common.MachineName.Trim();
+            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+        }
+
+        private static void InitializeMachinePoolFromSettings()
+        {
+            try
+            {
+                MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
+                for (int i = 0; i < info.Length; i++)
+                {
+                    info[i].Name = info[i].Name.Trim();
+                }
+
+                MachineStuff.MachinePool.Initialize(info);
+                MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
+            }
+            catch (Exception ex)
+            {
+                Logger.Log(ex);
+                MachineStuff.MachinePool.Clear();
+            }
+        }
+
+        internal static void SetupMachineNameAndID()
+        {
+            try
+            {
+                GetMachineName();
+                DesMachineID = MachineStuff.NewDesMachineID = MachineID;
+
+                // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
+                InitializeMachinePoolFromSettings();
+
+                Common.MachineName = Common.MachineName.Trim();
+                _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
+                _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+
+                MachineStuff.UpdateMachinePoolStringSetting();
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+        internal static void Init()
+        {
+            _ = Helper.GetUserName();
+            Common.GeneratedKey = true;
+
+            try
+            {
+                Common.MyKey = Setting.Values.MyKey;
+                int tmp = Setting.Values.MyKeyDaysToExpire;
+            }
+            catch (FormatException e)
+            {
+                Common.KeyCorrupted = true;
+                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+                Logger.Log(e.Message);
+            }
+            catch (CryptographicException e)
+            {
+                Common.KeyCorrupted = true;
+                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+                Logger.Log(e.Message);
+            }
+
+            try
+            {
+                InputSimulation.Injector = InputInjector.TryCreate();
+                if (InputSimulation.Injector != null)
+                {
+                    InputSimulation.MoveMouseRelative(0, 0);
+                    NativeMethods.InjectMouseInputAvailable = true;
+                }
+            }
+            catch (EntryPointNotFoundException)
+            {
+                NativeMethods.InjectMouseInputAvailable = false;
+                Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
+            }
+
+            bool dummy = Setting.Values.DrawMouseEx;
+            Is64bitOS = IntPtr.Size == 8;
+            tcpPort = Setting.Values.TcpPort;
+            GetScreenConfig();
+            PackageSent = new PackageMonitor(0);
+            PackageReceived = new PackageMonitor(0);
+            SetupMachineNameAndID();
+            InitEncryption();
+            CreateHelperThreads();
+
+            SystemEvents.DisplaySettingsChanged += new EventHandler(SystemEvents_DisplaySettingsChanged);
+            NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
+            SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+            PleaseReopenSocket = 9;
+            /* TODO: Telemetry for the matrix? */
+        }
+
+        private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
+        {
+            Helper.WndProcCounter++;
+
+            if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
+            {
+                Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
+                LastResumeSuspendTime = DateTime.UtcNow;
+                MachineStuff.SwitchToMultipleMode(false, true);
+            }
+        }
+
+        private static void CreateHelperThreads()
+        {
+            // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
+            /*
+            Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
+            watchDogThread.Priority = ThreadPriority.Highest;
+            watchDogThread.Start();
+            */
+
+            helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
+            helper.SetApartmentState(ApartmentState.STA);
+            helper.Start();
+        }
+
+        private static void AskHelperThreadsToExit(int waitTime)
+        {
+            Helper.signalHelperToExit = true;
+            Helper.signalWatchDogToExit = true;
+            _ = EvSwitch.Set();
+
+            int c = 0;
+            if (helper != null && c < waitTime)
+            {
+                while (Helper.signalHelperToExit)
+                {
+                    Thread.Sleep(1);
+                }
+
+                helper = null;
+            }
+        }
+
+        internal static void Cleanup()
+        {
+            try
+            {
+                SendByeBye();
+
+                // UnhookClipboard();
+                AskHelperThreadsToExit(500);
+                MainForm.NotifyIcon.Visible = false;
+                MainForm.NotifyIcon.Dispose();
+                CloseAllFormsAndHooks();
+
+                DoSomethingInUIThread(() =>
+                {
+                    Sk?.Close(true);
+                });
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+        private static long lastReleaseAllKeysCall;
+
+        internal static void ReleaseAllKeys()
+        {
+            if (Math.Abs(GetTick() - lastReleaseAllKeysCall) < 2000)
+            {
+                return;
+            }
+
+            lastReleaseAllKeysCall = GetTick();
+
+            KEYBDDATA kd;
+            kd.dwFlags = (int)LLKHF.UP;
+
+            VK[] keys = new VK[]
+            {
+                VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
+                VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
+            };
+
+            Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
+
+            foreach (VK vk in keys)
+            {
+                if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
+                {
+                    Logger.LogDebug(vk.ToString() + " is down, release it...");
+                    Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
+                    kd.wVk = (int)vk;
+                    InputSimulation.SendKey(kd);
+                    Hook?.ResetLastSwitchKeys();
+                }
+            }
+        }
+
+        private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
+        {
+            Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
+            Helper.WndProcCounter++;
+            ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
+        }
+
+        private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
+        {
+            if (closeSockets)
+            {
+                // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
+                // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
+                DoSomethingInUIThread(
+                    () =>
+                {
+                    SocketStuff s = Sk;
+                    Sk = null;
+                    s?.Close(false);
+                },
+                    true);
+            }
+
+            if (!Common.IsMyDesktopActive())
+            {
+                PleaseReopenSocket = 0;
+            }
+            else if (PleaseReopenSocket != 10)
+            {
+                PleaseReopenSocket = 10;
+            }
+        }
+    }
+}

src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs

@@ -36,7 +36,7 @@ namespace MouseWithoutBorders
 
         internal static string ActiveDesktop => Common.activeDesktop;
 
-        internal static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
+        private static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
         {
             GetScreenConfig();
         }
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders
                         Setting.Values.LastX = JUST_GOT_BACK_FROM_SCREEN_SAVER;
                         if (cleanupIfExit)
                         {
-                            InitAndCleanup.Cleanup();
+                            Common.Cleanup();
                         }
 
                         Process.GetCurrentProcess().KillProcess();

src/modules/MouseWithoutBorders/App/Class/Common.cs

@@ -33,7 +33,6 @@ using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
 using MouseWithoutBorders.Exceptions;
 
-using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 // Log is enough
@@ -91,8 +90,8 @@ namespace MouseWithoutBorders
         private static FrmMatrix matrixForm;
         private static FrmInputCallback inputCallbackForm;
         private static FrmAbout aboutForm;
+        private static Thread helper;
 #pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
-        internal static Thread helper;
         internal static int screenWidth;
         internal static int screenHeight;
 #pragma warning restore SA1307
@@ -122,9 +121,7 @@ namespace MouseWithoutBorders
         internal static int switchCount;
 #pragma warning restore SA1307
         private static long lastReconnectByHotKeyTime;
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
-        internal static int tcpPort;
-#pragma warning restore SA1307
+        private static int tcpPort;
         private static bool secondOpenSocketTry;
         private static string binaryName;
 
@@ -213,7 +210,7 @@ namespace MouseWithoutBorders
 
         internal static bool Is64bitOS
         {
-            get; set;
+            get; private set;
 
             // set { Common.is64bitOS = value; }
         }
@@ -614,7 +611,7 @@ namespace MouseWithoutBorders
         }
          * */
 
-        internal static void SendByeBye()
+        private static void SendByeBye()
         {
             Logger.LogDebug($"{nameof(SendByeBye)}");
             SendPackage(ID.ALL, PackageType.ByeBye);
@@ -728,7 +725,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(string machine, string file)
         {
-            Clipboard.LastDragDropFile = file;
+            LastDragDropFile = file;
 
             // Send ClipboardCapture
             if (machine.Equals("All", StringComparison.OrdinalIgnoreCase))
@@ -747,7 +744,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(ID src, string file)
         {
-            Clipboard.LastDragDropFile = file;
+            LastDragDropFile = file;
 
             // Send ClipboardCapture
             SendPackage(src, PackageType.ClipboardCapture);
@@ -1294,7 +1291,7 @@ namespace MouseWithoutBorders
             });
         }
 
-        internal static string GetMyStorageDir()
+        private static string GetMyStorageDir()
         {
             string st = string.Empty;
 

src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs

@@ -28,7 +28,6 @@ using MouseWithoutBorders.Core;
 
 using SystemClipboard = System.Windows.Forms.Clipboard;
 #if !MM_HELPER
-using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 #endif
 
@@ -160,7 +159,7 @@ namespace MouseWithoutBorders
 
         public void SendClipboardData(ByteArrayOrString data, bool isFilePath)
         {
-            _ = Clipboard.CheckClipboardEx(data, isFilePath);
+            _ = Common.CheckClipboardEx(data, isFilePath);
         }
     }
 #endif

src/modules/MouseWithoutBorders/App/Class/InputHook.cs

@@ -579,7 +579,7 @@ namespace MouseWithoutBorders.Class
             {
                 Common.ShowToolTip("Reconnecting...", 2000);
                 Common.LastReconnectByHotKeyTime = Common.GetTick();
-                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
+                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
                 return false;
             }
 
@@ -632,7 +632,7 @@ namespace MouseWithoutBorders.Class
                 {
                     // Common.DoSomethingInUIThread(delegate()
                     {
-                        InitAndCleanup.ReleaseAllKeys();
+                        Common.ReleaseAllKeys();
                     }
 
                     // );

src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs

@@ -407,7 +407,7 @@ namespace MouseWithoutBorders.Class
                     {
                         ResetModifiersState(Setting.Values.HotKeyLockMachine);
                         eatKey = true;
-                        InitAndCleanup.ReleaseAllKeys();
+                        Common.ReleaseAllKeys();
                         _ = NativeMethods.LockWorkStation();
                     }
                 }
@@ -439,7 +439,7 @@ namespace MouseWithoutBorders.Class
                         {
                             ctrlDown = altDown = false;
                             eatKey = true;
-                            InitAndCleanup.ReleaseAllKeys();
+                            Common.ReleaseAllKeys();
                         }
 
                         break;
@@ -449,7 +449,7 @@ namespace MouseWithoutBorders.Class
                         {
                             winDown = false;
                             eatKey = true;
-                            InitAndCleanup.ReleaseAllKeys();
+                            Common.ReleaseAllKeys();
                             uint rv = NativeMethods.LockWorkStation();
                             Logger.LogDebug("LockWorkStation returned " + rv.ToString(CultureInfo.CurrentCulture));
                         }

src/modules/MouseWithoutBorders/App/Class/Program.cs

@@ -235,7 +235,7 @@ namespace MouseWithoutBorders.Class
                 _ = Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
                 Application.SetCompatibleTextRenderingDefault(false);
 
-                InitAndCleanup.Init();
+                Common.Init();
                 Core.Helper.WndProcCounter++;
 
                 var formScreen = new FrmScreen();
@@ -314,7 +314,7 @@ namespace MouseWithoutBorders.Class
                 MachineStuff.UpdateMachinePoolStringSetting();
 
                 SocketStuff.InvalidKeyFound = false;
-                InitAndCleanup.ReopenSocketDueToReadError = true;
+                Common.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
                 MachineStuff.SendMachineMatrix();
 
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders.Class
             public void Reconnect()
             {
                 SocketStuff.InvalidKeyFound = false;
-                InitAndCleanup.ReopenSocketDueToReadError = true;
+                Common.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -397,7 +397,7 @@ namespace MouseWithoutBorders.Class
             using var asyncFlowControl = ExecutionContext.SuppressFlow();
 
             Common.InputCallbackThreadID = Thread.CurrentThread.ManagedThreadId;
-            while (!InitAndCleanup.InitDone)
+            while (!Common.InitDone)
             {
                 Thread.Sleep(100);
             }

src/modules/MouseWithoutBorders/App/Class/Setting.cs

@@ -118,7 +118,7 @@ namespace MouseWithoutBorders.Class
                         if (shouldReopenSockets)
                         {
                             SocketStuff.InvalidKeyFound = false;
-                            InitAndCleanup.ReopenSocketDueToReadError = true;
+                            Common.ReopenSocketDueToReadError = true;
                             Common.ReopenSockets(true);
                         }
 

src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs

@@ -29,7 +29,6 @@ using MouseWithoutBorders.Core;
 // </history>
 using MouseWithoutBorders.Exceptions;
 
-using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 [module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.SocketStuff.#SendData(System.Byte[])", Justification = "Dotnet port with style preservation")]
@@ -282,7 +281,7 @@ namespace MouseWithoutBorders.Class
              * */
 
             Common.GetMachineName(); // IPs might have been changed
-            InitAndCleanup.UpdateMachineTimeAndID();
+            Common.UpdateMachineTimeAndID();
 
             Logger.LogDebug("Creating sockets...");
 
@@ -309,7 +308,7 @@ namespace MouseWithoutBorders.Class
                             {
                                 Logger.TelemetryLogTrace("Restarting the service dues to WSAEADDRINUSE.", SeverityLevel.Warning);
                                 Program.StartService();
-                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
+                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
                             }
 
                             break;
@@ -1249,7 +1248,7 @@ namespace MouseWithoutBorders.Class
             // WSAECONNRESET
             if (e is ExpectedSocketException se && se.ShouldReconnect)
             {
-                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
+                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
                 Logger.Log($"MainTCPRoutine: {nameof(FlagReopenSocketIfNeeded)}");
             }
         }
@@ -1307,7 +1306,7 @@ namespace MouseWithoutBorders.Class
             }
             catch (ObjectDisposedException e)
             {
-                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
+                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
                 UpdateTcpSockets(currentTcp, SocketStatus.ForceClosed);
                 currentSocket.Close();
                 Logger.Log($"{nameof(MainTCPRoutine)}: The socket could have been closed/disposed by other threads: {e.Message}");
@@ -1354,10 +1353,10 @@ namespace MouseWithoutBorders.Class
                              * In this case, we should give ONE try to reconnect.
                              */
 
-                            if (InitAndCleanup.ReopenSocketDueToReadError)
+                            if (Common.ReopenSocketDueToReadError)
                             {
-                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
-                                InitAndCleanup.ReopenSocketDueToReadError = false;
+                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                                Common.ReopenSocketDueToReadError = false;
                             }
 
                             break;
@@ -1642,7 +1641,7 @@ namespace MouseWithoutBorders.Class
 
                 bool clientPushData = true;
                 ClipboardPostAction postAction = ClipboardPostAction.Other;
-                bool handShaken = Clipboard.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
+                bool handShaken = Common.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
 
                 if (!handShaken)
                 {
@@ -1657,7 +1656,7 @@ namespace MouseWithoutBorders.Class
 
                 if (clientPushData)
                 {
-                    Clipboard.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
+                    Common.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
                 }
                 else
                 {
@@ -1681,23 +1680,23 @@ namespace MouseWithoutBorders.Class
             const int CLOSE_TIMEOUT = 10;
             byte[] header = new byte[1024];
             string headerString = string.Empty;
-            if (Clipboard.LastDragDropFile != null)
+            if (Common.LastDragDropFile != null)
             {
                 string fileName = null;
 
                 if (!Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
                 {
-                    if (!File.Exists(Clipboard.LastDragDropFile))
+                    if (!File.Exists(Common.LastDragDropFile))
                     {
-                        headerString = Directory.Exists(Clipboard.LastDragDropFile)
-                            ? $"{0}*{Clipboard.LastDragDropFile} - Folder is not supported, zip it first!"
-                            : Clipboard.LastDragDropFile.Contains("- File too big")
-                                ? $"{0}*{Clipboard.LastDragDropFile}"
-                                : $"{0}*{Clipboard.LastDragDropFile} not found!";
+                        headerString = Directory.Exists(Common.LastDragDropFile)
+                            ? $"{0}*{Common.LastDragDropFile} - Folder is not supported, zip it first!"
+                            : Common.LastDragDropFile.Contains("- File too big")
+                                ? $"{0}*{Common.LastDragDropFile}"
+                                : $"{0}*{Common.LastDragDropFile} not found!";
                     }
                     else
                     {
-                        fileName = Clipboard.LastDragDropFile;
+                        fileName = Common.LastDragDropFile;
                         headerString = $"{new FileInfo(fileName).Length}*{fileName}";
                     }
                 }))
@@ -1740,11 +1739,11 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (!Clipboard.IsClipboardDataImage && Clipboard.LastClipboardData != null)
+            else if (!Common.IsClipboardDataImage && Common.LastClipboardData != null)
             {
                 try
                 {
-                    byte[] data = Clipboard.LastClipboardData;
+                    byte[] data = Common.LastClipboardData;
 
                     headerString = $"{data.Length}*{"text"}";
                     Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1774,9 +1773,9 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (Clipboard.LastClipboardData != null && Clipboard.LastClipboardData.Length > 0)
+            else if (Common.LastClipboardData != null && Common.LastClipboardData.Length > 0)
             {
-                byte[] data = Clipboard.LastClipboardData;
+                byte[] data = Common.LastClipboardData;
 
                 headerString = $"{data.Length}*{"image"}";
                 Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1985,8 +1984,8 @@ namespace MouseWithoutBorders.Class
                             {
                                 tcp = null;
                                 Setting.Values.MachineId = Common.Ran.Next();
-                                InitAndCleanup.UpdateMachineTimeAndID();
-                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
+                                Common.UpdateMachineTimeAndID();
+                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
 
                                 Logger.TelemetryLogTrace("MachineID conflict.", SeverityLevel.Information);
                             }

src/modules/MouseWithoutBorders/App/Core/DragDrop.cs

@@ -83,7 +83,7 @@ internal static class DragDrop
         if (wParam == Common.WM_RBUTTONUP && IsDropping)
         {
             IsDropping = false;
-            Clipboard.LastIDWithClipboardData = ID.NONE;
+            Common.LastIDWithClipboardData = ID.NONE;
         }
     }
 
@@ -193,7 +193,7 @@ internal static class DragDrop
             {
                 if (!string.IsNullOrEmpty(dragFileName) && (File.Exists(dragFileName) || Directory.Exists(dragFileName)))
                 {
-                    Clipboard.LastDragDropFile = dragFileName;
+                    Common.LastDragDropFile = dragFileName;
                     /*
                      * possibleDropMachineID is used as desID sent in DragDropStep06();
                      * */
@@ -270,7 +270,7 @@ internal static class DragDrop
             else
             {
                 IsDragging = false;
-                Clipboard.LastIDWithClipboardData = ID.NONE;
+                Common.LastIDWithClipboardData = ID.NONE;
             }
         }
     }
@@ -280,7 +280,7 @@ internal static class DragDrop
         Logger.LogDebug("DragDropStep10: Hide the form and get data...");
         IsDropping = false;
         IsDragging = false;
-        Clipboard.LastIDWithClipboardData = ID.NONE;
+        Common.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {
@@ -288,7 +288,7 @@ internal static class DragDrop
         });
 
         PowerToysTelemetry.Log.WriteEvent(new MouseWithoutBorders.Telemetry.MouseWithoutBordersDragAndDropEvent());
-        Clipboard.GetRemoteClipboard("desktop");
+        Common.GetRemoteClipboard("desktop");
     }
 
     internal static void DragDropStep11()
@@ -298,8 +298,8 @@ internal static class DragDrop
         IsDropping = false;
         IsDragging = false;
         DragMachine = (ID)1;
-        Clipboard.LastIDWithClipboardData = ID.NONE;
-        Clipboard.LastDragDropFile = null;
+        Common.LastIDWithClipboardData = ID.NONE;
+        Common.LastDragDropFile = null;
         MouseDown = false;
     }
 
@@ -307,7 +307,7 @@ internal static class DragDrop
     {
         Logger.LogDebug("DragDropStep12: ClipboardDragDropEnd received");
         IsDropping = false;
-        Clipboard.LastIDWithClipboardData = ID.NONE;
+        Common.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {

src/modules/MouseWithoutBorders/App/Core/Event.cs

@@ -78,7 +78,7 @@ internal static class Event
                 // if they are, check that there is no application running in fullscreen mode before switching.
                 if (!p.IsEmpty && Common.IsEasyMouseSwitchAllowed())
                 {
-                    Clipboard.HasSwitchedMachineSinceLastCopy = true;
+                    Common.HasSwitchedMachineSinceLastCopy = true;
 
                     Logger.LogDebug(string.Format(
                         CultureInfo.CurrentCulture,
@@ -218,10 +218,10 @@ internal static class Event
 
                 if (MachineStuff.desMachineID == Common.MachineID)
                 {
-                    if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT)
+                    if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT)
                     {
-                        Clipboard.clipboardCopiedTime = 0;
-                        Clipboard.GetRemoteClipboard("PrepareToSwitchToMachine");
+                        Common.clipboardCopiedTime = 0;
+                        Common.GetRemoteClipboard("PrepareToSwitchToMachine");
                     }
                 }
                 else

src/modules/MouseWithoutBorders/App/Core/Helper.cs

@@ -119,7 +119,7 @@ internal static class Helper
 
                 if (MachineStuff.NewDesMachineID == Common.MachineID)
                 {
-                    InitAndCleanup.ReleaseAllKeys();
+                    Common.ReleaseAllKeys();
                 }
             }
         }
@@ -317,7 +317,7 @@ internal static class Helper
                 Common.GetInputDesktop(),
                 0);
 
-            Clipboard.HasSwitchedMachineSinceLastCopy = true;
+            Common.HasSwitchedMachineSinceLastCopy = true;
 
             // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
             var processes = Process.GetProcessesByName(HelperProcessName);

src/modules/MouseWithoutBorders/App/Core/InitAndCleanup.cs

@@ -1,278 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using System.Net.NetworkInformation;
-using System.Security.Cryptography;
-using System.Threading;
-
-using Microsoft.Win32;
-using MouseWithoutBorders.Class;
-using Windows.UI.Input.Preview.Injection;
-
-// <summary>
-//     Initialization and clean up.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal static class InitAndCleanup
-{
-    private static bool initDone;
-    internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
-    internal static int REOPEN_WHEN_HOTKEY = -10055;
-    internal static int PleaseReopenSocket;
-    internal static bool ReopenSocketDueToReadError;
-
-    private static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
-
-    internal static bool InitDone
-    {
-        get => InitAndCleanup.initDone;
-        set => InitAndCleanup.initDone = value;
-    }
-
-    internal static void UpdateMachineTimeAndID()
-    {
-        Common.MachineName = Common.MachineName.Trim();
-        _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-    }
-
-    private static void InitializeMachinePoolFromSettings()
-    {
-        try
-        {
-            MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
-            for (int i = 0; i < info.Length; i++)
-            {
-                info[i].Name = info[i].Name.Trim();
-            }
-
-            MachineStuff.MachinePool.Initialize(info);
-            MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
-        }
-        catch (Exception ex)
-        {
-            Logger.Log(ex);
-            MachineStuff.MachinePool.Clear();
-        }
-    }
-
-    private static void SetupMachineNameAndID()
-    {
-        try
-        {
-            Common.GetMachineName();
-            Common.DesMachineID = MachineStuff.NewDesMachineID = Common.MachineID;
-
-            // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
-            InitializeMachinePoolFromSettings();
-
-            Common.MachineName = Common.MachineName.Trim();
-            _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
-            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-
-            MachineStuff.UpdateMachinePoolStringSetting();
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-    internal static void Init()
-    {
-        _ = Helper.GetUserName();
-        Common.GeneratedKey = true;
-
-        try
-        {
-            Common.MyKey = Setting.Values.MyKey;
-            int tmp = Setting.Values.MyKeyDaysToExpire;
-        }
-        catch (FormatException e)
-        {
-            Common.KeyCorrupted = true;
-            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-            Logger.Log(e.Message);
-        }
-        catch (CryptographicException e)
-        {
-            Common.KeyCorrupted = true;
-            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-            Logger.Log(e.Message);
-        }
-
-        try
-        {
-            InputSimulation.Injector = InputInjector.TryCreate();
-            if (InputSimulation.Injector != null)
-            {
-                InputSimulation.MoveMouseRelative(0, 0);
-                NativeMethods.InjectMouseInputAvailable = true;
-            }
-        }
-        catch (EntryPointNotFoundException)
-        {
-            NativeMethods.InjectMouseInputAvailable = false;
-            Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
-        }
-
-        bool dummy = Setting.Values.DrawMouseEx;
-        Common.Is64bitOS = IntPtr.Size == 8;
-        Common.tcpPort = Setting.Values.TcpPort;
-        Common.GetScreenConfig();
-        Common.PackageSent = new PackageMonitor(0);
-        Common.PackageReceived = new PackageMonitor(0);
-        SetupMachineNameAndID();
-        Common.InitEncryption();
-        CreateHelperThreads();
-
-        SystemEvents.DisplaySettingsChanged += new EventHandler(Common.SystemEvents_DisplaySettingsChanged);
-        NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
-        SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
-        PleaseReopenSocket = 9;
-        /* TODO: Telemetry for the matrix? */
-    }
-
-    private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
-    {
-        Helper.WndProcCounter++;
-
-        if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
-        {
-            Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
-            LastResumeSuspendTime = DateTime.UtcNow;
-            MachineStuff.SwitchToMultipleMode(false, true);
-        }
-    }
-
-    private static void CreateHelperThreads()
-    {
-        // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
-        /*
-        Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
-        watchDogThread.Priority = ThreadPriority.Highest;
-        watchDogThread.Start();
-        */
-
-        Common.helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
-        Common.helper.SetApartmentState(ApartmentState.STA);
-        Common.helper.Start();
-    }
-
-    private static void AskHelperThreadsToExit(int waitTime)
-    {
-        Helper.signalHelperToExit = true;
-        Helper.signalWatchDogToExit = true;
-        _ = Common.EvSwitch.Set();
-
-        int c = 0;
-        if (Common.helper != null && c < waitTime)
-        {
-            while (Helper.signalHelperToExit)
-            {
-                Thread.Sleep(1);
-            }
-
-            Common.helper = null;
-        }
-    }
-
-    internal static void Cleanup()
-    {
-        try
-        {
-            Common.SendByeBye();
-
-            // UnhookClipboard();
-            AskHelperThreadsToExit(500);
-            Common.MainForm.NotifyIcon.Visible = false;
-            Common.MainForm.NotifyIcon.Dispose();
-            Common.CloseAllFormsAndHooks();
-
-            Common.DoSomethingInUIThread(() =>
-            {
-                Common.Sk?.Close(true);
-            });
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-    private static long lastReleaseAllKeysCall;
-
-    internal static void ReleaseAllKeys()
-    {
-        if (Math.Abs(Common.GetTick() - lastReleaseAllKeysCall) < 2000)
-        {
-            return;
-        }
-
-        lastReleaseAllKeysCall = Common.GetTick();
-
-        KEYBDDATA kd;
-        kd.dwFlags = (int)Common.LLKHF.UP;
-
-        VK[] keys = new VK[]
-        {
-            VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
-            VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
-        };
-
-        Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
-
-        foreach (VK vk in keys)
-        {
-            if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
-            {
-                Logger.LogDebug(vk.ToString() + " is down, release it...");
-                Common.Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
-                kd.wVk = (int)vk;
-                InputSimulation.SendKey(kd);
-                Common.Hook?.ResetLastSwitchKeys();
-            }
-        }
-    }
-
-    private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
-    {
-        Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
-        Helper.WndProcCounter++;
-        ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
-    }
-
-    private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
-    {
-        if (closeSockets)
-        {
-            // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
-            // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
-            Common.DoSomethingInUIThread(
-                () =>
-            {
-                SocketStuff s = Common.Sk;
-                Common.Sk = null;
-                s?.Close(false);
-            },
-                true);
-        }
-
-        if (!Common.IsMyDesktopActive())
-        {
-            PleaseReopenSocket = 0;
-        }
-        else if (PleaseReopenSocket != 10)
-        {
-            PleaseReopenSocket = 10;
-        }
-    }
-}

src/modules/MouseWithoutBorders/App/Core/Logger.cs

@@ -247,24 +247,22 @@ internal static class Logger
 
     internal static void DumpStaticTypes(StringBuilder sb, int level)
     {
-        var staticTypes = new List<Type>
-        {
-            typeof(Clipboard),
-            typeof(DragDrop),
-            typeof(Event),
-            typeof(InitAndCleanup),
-            typeof(Helper),
-            typeof(Launch),
-            typeof(Logger),
-            typeof(MachineStuff),
-            typeof(Receiver),
-            typeof(Service),
-        };
-        foreach (var staticType in staticTypes)
-        {
-            sb.AppendLine(CultureInfo.InvariantCulture, $"[{staticType.Name}]\r\n===============");
-            Logger.DumpType(sb, staticType, 0, level);
-        }
+        sb.AppendLine($"[{nameof(DragDrop)}]\r\n===============");
+        Logger.DumpType(sb, typeof(DragDrop), 0, level);
+        sb.AppendLine($"[{nameof(Event)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Event), 0, level);
+        sb.AppendLine($"[{nameof(Helper)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Helper), 0, level);
+        sb.AppendLine($"[{nameof(Launch)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Launch), 0, level);
+        sb.AppendLine($"[{nameof(Logger)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Logger), 0, level);
+        sb.AppendLine($"[{nameof(MachineStuff)}]\r\n===============");
+        Logger.DumpType(sb, typeof(MachineStuff), 0, level);
+        sb.AppendLine($"[{nameof(Receiver)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Receiver), 0, level);
+        sb.AppendLine($"[{nameof(Service)}]\r\n===============");
+        Logger.DumpType(sb, typeof(Service), 0, level);
     }
 
     internal static bool PrivateDump(StringBuilder sb, object obj, string objName, int level, int maxLevel, bool stop)

src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs

@@ -992,7 +992,7 @@ internal static class MachineStuff
                 Setting.Values.MatrixOneRow = !((package.Type & PackageType.MatrixTwoRowFlag) == PackageType.MatrixTwoRowFlag);
                 MachineMatrix = MachineMatrix; // Save
 
-                InitAndCleanup.ReopenSocketDueToReadError = true;
+                Common.ReopenSocketDueToReadError = true;
 
                 UpdateClientSockets("UpdateMachineMatrix");
 
@@ -1044,7 +1044,7 @@ internal static class MachineStuff
             Common.MoveMouseToCenter();
         }
 
-        InitAndCleanup.ReleaseAllKeys();
+        Common.ReleaseAllKeys();
 
         Common.UpdateMultipleModeIconAndMenu();
     }

src/modules/MouseWithoutBorders/App/Core/Receiver.cs

@@ -157,7 +157,7 @@ internal static class Receiver
 
                             if (!p.IsEmpty)
                             {
-                                Clipboard.HasSwitchedMachineSinceLastCopy = true;
+                                Common.HasSwitchedMachineSinceLastCopy = true;
 
                                 Logger.LogDebug(string.Format(
                                     CultureInfo.CurrentCulture,
@@ -274,7 +274,7 @@ internal static class Receiver
                 Common.PackageReceived.Clipboard++;
                 if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                 {
-                    Clipboard.clipboardCopiedTime = Common.GetTick();
+                    Common.clipboardCopiedTime = Common.GetTick();
                     GetNameOfMachineWithClipboardData(package);
                     SignalBigClipboardData();
                 }
@@ -282,10 +282,10 @@ internal static class Receiver
                 break;
 
             case PackageType.MachineSwitched:
-                if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
+                if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
                 {
-                    Clipboard.clipboardCopiedTime = 0;
-                    Clipboard.GetRemoteClipboard("PackageType.MachineSwitched");
+                    Common.clipboardCopiedTime = 0;
+                    Common.GetRemoteClipboard("PackageType.MachineSwitched");
                 }
 
                 break;
@@ -297,7 +297,7 @@ internal static class Receiver
                     if (package.Des == Common.MachineID || package.Des == ID.ALL)
                     {
                         GetNameOfMachineWithClipboardData(package);
-                        Clipboard.GetRemoteClipboard("mspaint," + Clipboard.LastMachineWithClipboardData);
+                        Common.GetRemoteClipboard("mspaint," + Common.LastMachineWithClipboardData);
                     }
                 }
 
@@ -326,10 +326,10 @@ internal static class Receiver
                             Thread.UpdateThreads(thread);
 
                             string remoteMachine = package.MachineName;
-                            System.Net.Sockets.TcpClient client = Clipboard.ConnectToRemoteClipboardSocket(remoteMachine);
+                            System.Net.Sockets.TcpClient client = Common.ConnectToRemoteClipboardSocket(remoteMachine);
                             bool clientPushData = true;
 
-                            if (Clipboard.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
+                            if (Common.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
                             {
                                 SocketStuff.SendClipboardData(client.Client, enStream);
                             }
@@ -360,7 +360,7 @@ internal static class Receiver
 
             case PackageType.ClipboardText:
             case PackageType.ClipboardImage:
-                Clipboard.clipboardCopiedTime = 0;
+                Common.clipboardCopiedTime = 0;
                 if (package.Type == PackageType.ClipboardImage)
                 {
                     Common.PackageReceived.ClipboardImage++;
@@ -372,7 +372,7 @@ internal static class Receiver
 
                 if (tcp != null)
                 {
-                    Clipboard.ReceiveClipboardDataUsingTCP(
+                    Common.ReceiveClipboardDataUsingTCP(
                         package,
                         package.Type == PackageType.ClipboardImage,
                         tcp);
@@ -381,10 +381,10 @@ internal static class Receiver
                 break;
 
             case PackageType.HideMouse:
-                Clipboard.HasSwitchedMachineSinceLastCopy = true;
+                Common.HasSwitchedMachineSinceLastCopy = true;
                 Common.HideMouseCursor(true);
                 Helper.MainFormDotEx(false);
-                InitAndCleanup.ReleaseAllKeys();
+                Common.ReleaseAllKeys();
                 break;
 
             default:
@@ -405,11 +405,11 @@ internal static class Receiver
 
     internal static void GetNameOfMachineWithClipboardData(DATA package)
     {
-        Clipboard.LastIDWithClipboardData = package.Src;
-        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Clipboard.LastIDWithClipboardData);
+        Common.LastIDWithClipboardData = package.Src;
+        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Common.LastIDWithClipboardData);
         if (matchingMachines.Count >= 1)
         {
-            Clipboard.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
+            Common.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
         }
 
         /*

src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs

@@ -84,7 +84,7 @@ namespace MouseWithoutBorders
                 if ((connectedClientSocket = Common.GetConnectedClientSocket()) != null)
                 {
                     ShowStatus($"Connected from local IP Address: {connectedClientSocket.Address}.");
-                    InitAndCleanup.UpdateMachineTimeAndID();
+                    Common.UpdateMachineTimeAndID();
 
                     Common.MMSleep(1);
                     connected = true;

src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs

@@ -22,8 +22,6 @@ using Microsoft.PowerToys.Telemetry;
 // </history>
 using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
-
-using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Timer = System.Windows.Forms.Timer;
 
 [module: SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions", Scope = "member", Target = "MouseWithoutBorders.frmMatrix.#buttonOK_Click(System.Object,System.EventArgs)", Justification = "Dotnet port with style preservation")]
@@ -112,7 +110,7 @@ namespace MouseWithoutBorders
             {
                 SocketStuff.InvalidKeyFound = false;
                 showInvalidKeyMessage = false;
-                InitAndCleanup.ReopenSocketDueToReadError = true;
+                Common.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -782,7 +780,7 @@ namespace MouseWithoutBorders
 
             ShowUpdateMessage();
 
-            Clipboard.HasSwitchedMachineSinceLastCopy = true;
+            Common.HasSwitchedMachineSinceLastCopy = true;
         }
 
         private void CheckBoxDisableCAD_CheckedChanged(object sender, EventArgs e)

src/modules/MouseWithoutBorders/App/Form/frmScreen.cs

@@ -139,13 +139,13 @@ namespace MouseWithoutBorders
             {
                 if (cleanup)
                 {
-                    InitAndCleanup.Cleanup();
+                    Common.Cleanup();
                 }
 
                 Helper.WndProcCounter++;
                 if (!Common.RunOnScrSaverDesktop)
                 {
-                    InitAndCleanup.ReleaseAllKeys();
+                    Common.ReleaseAllKeys();
                 }
 
                 Helper.RunDDHelper(true);
@@ -412,7 +412,7 @@ namespace MouseWithoutBorders
 
                         count = 0;
 
-                        InitAndCleanup.InitDone = true;
+                        Common.InitDone = true;
 #if SHOW_ON_WINLOGON
                         if (Common.RunOnLogonDesktop)
                         {
@@ -423,39 +423,39 @@ namespace MouseWithoutBorders
 
                     if ((count % 2) == 0)
                     {
-                        if (InitAndCleanup.PleaseReopenSocket == 10 || (InitAndCleanup.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
+                        if (Common.PleaseReopenSocket == 10 || (Common.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
                         {
-                            if (!Common.AtLeastOneSocketEstablished() || InitAndCleanup.PleaseReopenSocket == 10)
+                            if (!Common.AtLeastOneSocketEstablished() || Common.PleaseReopenSocket == 10)
                             {
                                 Thread.Sleep(1000);
-                                if (InitAndCleanup.PleaseReopenSocket > 0)
+                                if (Common.PleaseReopenSocket > 0)
                                 {
-                                    InitAndCleanup.PleaseReopenSocket--;
+                                    Common.PleaseReopenSocket--;
                                 }
 
                                 // Double check.
                                 if (!Common.AtLeastOneSocketEstablished())
                                 {
                                     Common.GetMachineName();
-                                    Logger.LogDebug("Common.pleaseReopenSocket: " + InitAndCleanup.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
+                                    Logger.LogDebug("Common.pleaseReopenSocket: " + Common.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
                                     Common.ReopenSockets(false);
                                     MachineStuff.NewDesMachineID = Common.DesMachineID = Common.MachineID;
                                 }
                             }
                             else
                             {
-                                InitAndCleanup.PleaseReopenSocket = 0;
+                                Common.PleaseReopenSocket = 0;
                             }
                         }
 
-                        if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_HOTKEY)
+                        if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_HOTKEY)
                         {
-                            InitAndCleanup.PleaseReopenSocket = 0;
+                            Common.PleaseReopenSocket = 0;
                             Common.ReopenSockets(true);
                         }
-                        else if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_WSAECONNRESET)
+                        else if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_WSAECONNRESET)
                         {
-                            InitAndCleanup.PleaseReopenSocket = 0;
+                            Common.PleaseReopenSocket = 0;
                             Thread.Sleep(1000);
                             MachineStuff.UpdateClientSockets("REOPEN_WHEN_WSAECONNRESET");
                         }

src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt

@@ -4,6 +4,28 @@
 [Other Logs]
 ===============
  = MouseWithoutBorders.Common
+Comma = System.Char[]
+--System.Char[] = System.Char[]: N/A
+Star = System.Char[]
+--System.Char[] = System.Char[]: N/A
+NullSeparator = System.Char[]
+--System.Char[] = System.Char[]: N/A
+lastClipboardEventTime = 0
+clipboardCopiedTime = 0
+<LastIDWithClipboardData>k__BackingField = NONE
+<NextClipboardViewer>k__BackingField = 0
+<IsClipboardDataImage>k__BackingField = False
+lastClipboardObject = 
+<HasSwitchedMachineSinceLastCopy>k__BackingField = False
+ClipboardThreadOldLock = Lock
+--_owningThreadId = 0
+--_state = 0
+--_recursionCount = 0
+--_spinCount = 22
+--_waiterStartTimeMs = 0
+--s_contentionCount = 0
+--s_maxSpinCount = 22
+--s_minSpinCountForAdaptiveSpin = -100
 screenWidth = 0
 screenHeight = 0
 lastX = 0
@@ -77,6 +99,17 @@ LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte
 --_budget = ????????????
 --_growLockArray = True
 --_comparerIsDefaultForClasses = False
+initDone = False
+REOPEN_WHEN_WSAECONNRESET = -10054
+REOPEN_WHEN_HOTKEY = -10055
+PleaseReopenSocket = 0
+ReopenSocketDueToReadError = False
+<LastResumeSuspendTime>k__BackingField = ????????????
+--_dateData = ????????????
+--MinValue = 01/01/0001 00:00:00
+--MaxValue = 31/12/9999 23:59:59
+--UnixEpoch = 01/01/1970 00:00:00
+lastReleaseAllKeysCall = 0
 PackageSent = MouseWithoutBorders.PackageMonitor
 --Keyboard = 0
 --Mouse = 0
@@ -120,6 +153,12 @@ p = {X=0,Y=0}
 --y = 0
 --Empty = {X=0,Y=0}
 <IpcChannelCreated>k__BackingField = False
+BIG_CLIPBOARD_DATA_TIMEOUT = 30000
+MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
+MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
+TEXT_HEADER_SIZE = 12
+DATA_SIZE = 48
+TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 TOGGLE_ICONS_SIZE = 4
 ICON_ONE = 0
 ICON_ALL = 1
@@ -156,36 +195,6 @@ WM_KEYDOWN = 256
 WM_KEYUP = 257
 WM_SYSKEYDOWN = 260
 WM_SYSKEYUP = 261
-[Clipboard]
-===============
-Comma = System.Char[]
---System.Char[] = System.Char[]: N/A
-Star = System.Char[]
---System.Char[] = System.Char[]: N/A
-NullSeparator = System.Char[]
---System.Char[] = System.Char[]: N/A
-lastClipboardEventTime = 0
-clipboardCopiedTime = 0
-<LastIDWithClipboardData>k__BackingField = NONE
-<NextClipboardViewer>k__BackingField = 0
-<IsClipboardDataImage>k__BackingField = False
-lastClipboardObject = 
-<HasSwitchedMachineSinceLastCopy>k__BackingField = False
-ClipboardThreadOldLock = Lock
---_owningThreadId = 0
---_state = 0
---_recursionCount = 0
---_spinCount = 22
---_waiterStartTimeMs = 0
---s_contentionCount = 0
---s_maxSpinCount = 22
---s_minSpinCountForAdaptiveSpin = -100
-BIG_CLIPBOARD_DATA_TIMEOUT = 30000
-MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
-MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
-TEXT_HEADER_SIZE = 12
-DATA_SIZE = 48
-TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 [DragDrop]
 ===============
 isDragging = False
@@ -240,19 +249,6 @@ actualLastPos = {X=0,Y=0}
 --Empty = {X=0,Y=0}
 myLastX = 0
 myLastY = 0
-[InitAndCleanup]
-===============
-initDone = False
-REOPEN_WHEN_WSAECONNRESET = -10054
-REOPEN_WHEN_HOTKEY = -10055
-PleaseReopenSocket = 0
-ReopenSocketDueToReadError = False
-<LastResumeSuspendTime>k__BackingField = ????????????
---_dateData = ????????????
---MinValue = 01/01/0001 00:00:00
---MaxValue = 31/12/9999 23:59:59
---UnixEpoch = 01/01/1970 00:00:00
-lastReleaseAllKeysCall = 0
 [Helper]
 ===============
 signalHelperToExit = False

src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs

@@ -58,9 +58,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("gliding_delay_speed")]
         public IntProperty GlidingDelaySpeed { get; set; }
 
-        [JsonPropertyName("gliding_cursor_enabled")]
-        public BoolProperty GlidingCursorEnabled { get; set; }
-
         public MousePointerCrosshairsProperties()
         {
             ActivationShortcut = DefaultActivationShortcut;
@@ -77,7 +74,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             AutoActivate = new BoolProperty(false);
             GlidingTravelSpeed = new IntProperty(25);
             GlidingDelaySpeed = new IntProperty(5);
-            GlidingCursorEnabled = new BoolProperty(true);
         }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml

@@ -389,26 +389,15 @@
                         x:Uid="MouseUtils_GlidingCursor"
                         HeaderIcon="{ui:FontIcon Glyph=}"
                         IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            IsOn="{x:Bind ViewModel.GlidingCursorEnabled, Mode=TwoWay}" />
+                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.GlidingCursorActivationShortcut, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard
-                                x:Uid="MouseUtils_GlidingCursor_Shortcut"
-                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
-                                <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.GlidingCursorActivationShortcut, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard 
-                                x:Uid="MouseUtils_GlidingCursor_InitialSpeed"
-                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_GlidingCursor_InitialSpeed">
                                 <Slider
                                     Maximum="60"
                                     Minimum="5"
                                     Value="{x:Bind ViewModel.GlidingCursorTravelSpeed, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard 
-                                x:Uid="MouseUtils_GlidingCursor_DelaySpeed"
-                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsCard x:Uid="MouseUtils_GlidingCursor_DelaySpeed">
                                 <Slider
                                     Maximum="60"
                                     Minimum="5"

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -2914,12 +2914,6 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
     <value>Speed after slowing down the line with a second shortcut press</value>
   </data>
-  <data name="MouseUtils_GlidingCursor_Shortcut.Header" xml:space="preserve">
-    <value>Activation shortcut</value>
-  </data>
-  <data name="MouseUtils_GlidingCursor_Shortcut.Description" xml:space="preserve">
-    <value>Shortcut to activate gliding cursor</value>
-  </data>
   <data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
     <value>Custom colors</value>
   </data>

src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs

@@ -102,7 +102,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _mousePointerCrosshairsIsFixedLengthEnabled = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsIsFixedLengthEnabled.Value;
             _mousePointerCrosshairsFixedLength = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsFixedLength.Value;
             _mousePointerCrosshairsAutoActivate = MousePointerCrosshairsSettingsConfig.Properties.AutoActivate.Value;
-            _glidingCursorEnabled = MousePointerCrosshairsSettingsConfig.Properties.GlidingCursorEnabled.Value;
 
             int isEnabled = 0;
 
@@ -950,24 +949,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public bool GlidingCursorEnabled
-        {
-            get
-            {
-                return _glidingCursorEnabled;
-            }
-
-            set
-            {
-                if (value != _glidingCursorEnabled)
-                {
-                    _glidingCursorEnabled = value;
-                    MousePointerCrosshairsSettingsConfig.Properties.GlidingCursorEnabled.Value = value;
-                    NotifyMousePointerCrosshairsPropertyChanged();
-                }
-            }
-        }
-
         public void NotifyMousePointerCrosshairsPropertyChanged([CallerMemberName] string propertyName = null)
         {
             OnPropertyChanged(propertyName);
@@ -1031,7 +1012,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _mousePointerCrosshairsIsFixedLengthEnabled;
         private int _mousePointerCrosshairsFixedLength;
         private bool _mousePointerCrosshairsAutoActivate;
-        private bool _glidingCursorEnabled;
         private bool _isAnimationEnabledBySystem;
     }
 }