[Hot Fix] Fix Image Resizer not working on Win10 (#43763)

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
Windows 10 can’t launch the app using the Sparse Package. Remove the app
manifest so that Image Resizer can start properly on Windows 10.

We will figure out how to support Sparse Packages on Windows 10 in the
next release.
<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

- [x] Closes: #43747 #43734 #43722 #43759
<!-- - [ ] Closes: #yyy (add separate lines for additional resolved
issues) -->
- [ ] **Communication:** I've discussed this with core contributors
already. If the work hasn't been agreed, this work might be rejected
- [ ] **Tests:** Added/updated and all pass
- [ ] **Localization:** All end-user-facing strings can be localized
- [ ] **Dev docs:** Added/updated
- [ ] **New binaries:** Added on the required places
- [ ] [JSON for
signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json)
for new binaries
- [ ] [WXS for
installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs)
for new binaries and localization folder
- [ ] [YML for CI
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml)
for new test projects
- [ ] [YML for signed
pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml)
- [ ] **Documentation updated:** If checked, please file a pull request
on [our docs
repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys)
and link it here: #xxx

<!-- Provide a more detailed description of the PR, other things fixed,
or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests
wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed

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

@@ -2,8 +2,8 @@ AAAAs
 abcdefghjkmnpqrstuvxyz
 abgr
 ABlocked
-ABORTIFHUNG
 ABOUTBOX
+ABORTIFHUNG
 Abug
 Acceleratorkeys
 ACCEPTFILES
@@ -56,7 +56,6 @@ ANull
 AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
 AOklab
-aot
 APARTMENTTHREADED
 APeriod
 apicontract
@@ -98,8 +97,8 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
-ATRIOX
 ATX
+ATRIOX
 aumid
 authenticode
 AUTOBUDDY
@@ -118,10 +117,10 @@ azman
 azureaiinference
 azureinference
 azureopenai
-backticks
 bbwe
 BCIE
 bck
+backticks
 BESTEFFORT
 bezelled
 bhid
@@ -149,8 +148,8 @@ bmi
 BNumber
 BODGY
 BOklab
-BOOTSTRAPPERINSTALLFOLDER
 Bootstrappers
+BOOTSTRAPPERINSTALLFOLDER
 BOTTOMALIGN
 boxmodel
 BPBF
@@ -177,16 +176,17 @@ BYPOSITION
 CALCRECT
 CALG
 callbackptr
+cabstr
 calpwstr
+caub
 Cangjie
 CANRENAME
+Carlseibert
 Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
-Carlseibert
 CAtl
-caub
 CBN
 cch
 CCHDEVICENAME
@@ -206,9 +206,11 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
+CIBUILD
 cidl
 CIELCh
 cim
+claude
 CImage
 cla
 CLASSDC
@@ -262,6 +264,7 @@ CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+coreclr
 constexpr
 contentdialog
 contentfiles
@@ -273,7 +276,6 @@ copiedcolorrepresentation
 coppied
 copyable
 COPYPEN
-coreclr
 COREWINDOW
 Corpor
 cotaskmem
@@ -282,18 +284,18 @@ countof
 covrun
 cpcontrols
 cph
+cppcoreguidelines
 cplusplus
 CPower
-cppcoreguidelines
 cpptools
 cppvsdbg
 cppwinrt
 createdump
+creativecommons
 CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
 CREATEWINDOWFAILED
-creativecommons
 CRECT
 CRH
 critsec
@@ -329,6 +331,7 @@ CYSCREEN
 CYSMICON
 CYVIRTUALSCREEN
 Czechia
+cziplib
 Dac
 dacl
 DAffine
@@ -352,7 +355,9 @@ Deact
 debugbreak
 decryptor
 Dedup
+dfx
 Deduplicator
+Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
 DEFAULTCOLOR
 DEFAULTFLAGS
@@ -399,6 +404,7 @@ DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
 divyan
+djwsxzxb
 Dlg
 DLGFRAME
 DLGMODALFRAME
@@ -411,6 +417,7 @@ DONTVALIDATEPATH
 dotnet
 downsampled
 downsampling
+Downsampled
 downscale
 DPICHANGED
 DPIs
@@ -524,6 +531,7 @@ EXTRINSICPROPERTIES
 eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
+FNumber
 FARPROC
 fdx
 fesf
@@ -555,8 +563,8 @@ FIXEDSYS
 flac
 flyouts
 FMask
+foundrylocal
 fmtid
-FNumber
 FOF
 FOFX
 FOLDERID
@@ -567,7 +575,6 @@ FORCEMINIMIZE
 FORMATDLGORD
 formatetc
 FORPARSING
-foundrylocal
 FRAMECHANGED
 frm
 FROMTOUCH
@@ -586,13 +593,13 @@ gdi
 gdiplus
 GDIPVER
 GDISCALED
-geolocator
 GETCLIENTAREAANIMATION
 GETCURSEL
 GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
 getfilesiginforedist
+geolocator
 GETHOTKEY
 GETICON
 GETLBTEXT
@@ -603,12 +610,11 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
-GHND
+GIFs
 gitmodules
+GHND
 GMEM
 GNumber
-googleai
-googlegemini
 gpedit
 gpo
 GPOCA
@@ -625,6 +631,8 @@ GValue
 gwl
 GWLP
 GWLSTYLE
+googleai
+googlegemini
 hangeul
 Hanzi
 Hardlines
@@ -735,7 +743,9 @@ IDCANCEL
 IDD
 idk
 idl
+IIM
 idlist
+ifd
 IDOK
 IDOn
 IDR
@@ -744,16 +754,15 @@ ietf
 IEXPLORE
 IFACEMETHOD
 IFACEMETHODIMP
-ifd
 IGNOREUNKNOWN
 IGo
 iid
-IIM
 Iindex
 Ijwhost
 ILD
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
+IPTC
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
@@ -773,7 +782,6 @@ INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
 inlines
-Inno
 INPC
 inproc
 INPUTHARDWARE
@@ -790,6 +798,7 @@ INSTALLFOLDERTOPREVIOUSINSTALLFOLDER
 INSTALLLOCATION
 INSTALLMESSAGE
 INSTALLPROPERTY
+installscopeperuser
 INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
 Inste
@@ -802,7 +811,6 @@ invokecommand
 ipcmanager
 IPREVIEW
 ipreviewhandlervisualssetfont
-IPTC
 irow
 irprops
 isbi
@@ -846,14 +854,15 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
+ksa
 kvp
 Kybd
 LARGEICON
 lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
-lbl
 LCh
+lbl
 lcid
 LCIDTo
 lcl
@@ -869,10 +878,10 @@ LExit
 lhwnd
 LIBFUZZER
 LIBID
-lightswitch
 LIMITSIZE
 LIMITTEXT
 lindex
+lightswitch
 linkid
 LINKOVERLAY
 LINQTo
@@ -883,7 +892,6 @@ LLKH
 llkhf
 LMEM
 LMENU
-lng
 LOADFROMFILE
 LOBYTE
 localappdata
@@ -893,14 +901,17 @@ LOCATIONCHANGE
 LOCKTYPE
 LOGFONT
 LOGFONTW
-LOGMSG
 logon
+lon
+LOGMSG
 LOGPIXELSX
 LOGPIXELSY
+lng
 lon
 longdate
 LONGNAMES
 lowlevel
+lquadrant
 LOWORD
 lparam
 LPBITMAPINFOHEADER
@@ -934,7 +945,6 @@ lpv
 LPW
 lpwcx
 lpwndpl
-lquadrant
 LReader
 LRESULT
 LSTATUS
@@ -961,7 +971,6 @@ MAKELONG
 MAKELPARAM
 makepri
 MAKEWPARAM
-Malware
 manifestdependency
 MAPPEDTOSAMEKEY
 MAPTOSAMESHORTCUT
@@ -984,8 +993,8 @@ MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
-metadatamatters
 Metadatas
+metadatamatters
 metafile
 mfc
 Mgmt
@@ -1031,6 +1040,9 @@ mousepointer
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
+muxx
+muxxc
+muxxh
 MRM
 MRT
 mru
@@ -1059,14 +1071,10 @@ msrc
 msstore
 msvcp
 MT
-mstsc
 MTND
 MULTIPLEUSE
 multizone
 muxc
-muxx
-muxxc
-muxxh
 MVPs
 mvvm
 MVVMTK
@@ -1149,6 +1157,7 @@ nonstd
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
+NPU
 NOREDIRECTIONBITMAP
 NOREDRAW
 NOREMOVE
@@ -1177,7 +1186,6 @@ nowarn
 NOZORDER
 NPH
 npmjs
-NPU
 NResize
 NTAPI
 ntdll
@@ -1202,17 +1210,15 @@ oldpath
 oldtheme
 oleaut
 OLECHAR
-ollama
 onebranch
-onnx
 OOBEUI
 openas
 opencode
 OPENFILENAME
-openrdp
 opensource
 openxmlformats
 ollama
+Olllama
 onnx
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
@@ -1286,7 +1292,6 @@ pguid
 phbm
 phbmp
 phicon
-Photoshop
 phwnd
 pici
 pidl
@@ -1309,6 +1314,7 @@ pnid
 PNMLINK
 Poc
 Podcasts
+Photoshop
 POINTERID
 POINTERUPDATE
 Pokedex
@@ -1403,9 +1409,10 @@ pwsz
 pwtd
 QDC
 qit
+QNN
+Qualcomm
 QITAB
 QITABENT
-QNN
 qoi
 Quarternary
 QUERYENDSESSION
@@ -1415,8 +1422,8 @@ quickaccent
 QUNS
 RAII
 RAlt
-randi
 RAquadrant
+randi
 rasterization
 Rasterize
 RAWINPUTDEVICE
@@ -1426,8 +1433,6 @@ RAWPATH
 rbhid
 rclsid
 RCZOOMIT
-remotedesktop
-rdp
 RDW
 READMODE
 READOBJECTS
@@ -1445,7 +1450,9 @@ regfile
 REGISTERCLASSFAILED
 REGISTRYHEADER
 REGISTRYPREVIEWEXT
+registryroot
 regkey
+regroot
 regsvr
 REINSTALLMODE
 releaseblog
@@ -1498,6 +1505,7 @@ rstringalpha
 rstringdigit
 rtb
 RTLREADING
+rtm
 runas
 rundll
 rungameid
@@ -1554,8 +1562,8 @@ SETRULES
 SETSCREENSAVEACTIVE
 SETSTICKYKEYS
 SETTEXT
-SETTINGCHANGE
 settingscard
+SETTINGCHANGE
 SETTINGSCHANGED
 settingsheader
 settingshotkeycontrol
@@ -1630,7 +1638,6 @@ SKIPOWNPROCESS
 sku
 SLGP
 sln
-slnx
 SMALLICON
 smartphone
 smileys
@@ -1701,7 +1708,6 @@ stringtable
 stringval
 Strm
 strret
-STRSAFE
 stscanf
 sttngs
 Stubless
@@ -1713,6 +1719,7 @@ sublang
 SUBMODULEUPDATE
 subresource
 Superbar
+suntimes
 sut
 svchost
 SVGIn
@@ -1746,6 +1753,7 @@ SYSTEMMODAL
 SYSTEMTIME
 TARG
 TARGETAPPHEADER
+TARGETDIR
 targetentrypoint
 TARGETHEADER
 targetver
@@ -1775,10 +1783,10 @@ textextractor
 TEXTINCLUDE
 tfopen
 tgz
-THEMECHANGED
 themeresources
 THH
 THICKFRAME
+THEMECHANGED
 THISCOMPONENT
 throughs
 TILEDWINDOW
@@ -1849,7 +1857,6 @@ UNCPRIORITY
 UNDNAME
 UNICODETEXT
 unins
-Uninstaller
 uninstalls
 Uniquifies
 unitconverter
@@ -1876,6 +1883,7 @@ USEINSTALLERFORTEST
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
+utm
 UType
 uuidv
 uwp
@@ -1948,11 +1956,11 @@ Wca
 WCE
 wcex
 WClass
-WCRAPI
 wcsicmp
 wcsncpy
 wcsnicmp
 WCT
+WCRAPI
 WDA
 wdm
 wdp
@@ -1980,7 +1988,6 @@ WINDOWPLACEMENT
 WINDOWPOSCHANGED
 WINDOWPOSCHANGING
 WINDOWSBUILDNUMBER
-windowsml
 windowssearch
 windowssettings
 WINDOWSTYLES
@@ -1996,8 +2003,9 @@ Winhook
 WINL
 winlogon
 winmd
-winml
 WINNT
+windowsml
+winml
 winres
 winrt
 winsdk
@@ -2059,21 +2067,20 @@ WTSAT
 Wubi
 WUX
 Wwanpp
-xap
 XAxis
 XButton
 xclip
 xcopy
+xap
 XDeployment
-xdf
 XDimension
+xdf
 XDocument
 XElement
 xfd
 XFile
 XIncrement
 XLoc
-xmp
 XNamespace
 Xoshiro
 XPels
@@ -2084,22 +2091,23 @@ xsi
 XSpeed
 XStr
 xstyler
+xmp
 XTimer
 XUP
 XVIRTUALSCREEN
 xxxxxx
 YAxis
 ycombinator
-YDimension
 YIncrement
+YDimension
 yinle
 yinyue
 YPels
 YPos
 YResolution
 YSpeed
-YStr
 YTimer
+YStr
 YVIRTUALSCREEN
 ZEROINIT
 zonability

.github/pull_request_template.md

@@ -5,7 +5,6 @@
 ## PR Checklist
 
 - [ ] Closes: #xxx
-<!--  - [ ] Closes: #yyy (add separate lines for additional resolved issues) -->
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized

.github/workflows/dependency-review.yml

@@ -21,6 +21,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v4

.github/workflows/manual-batch-issue-deduplication.yml

@@ -27,7 +27,7 @@ jobs:
         issue: ${{ fromJson(github.event.inputs.issue_numbers) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v3
 
       - name: Run GenAI Issue Deduplicator
         uses: pelikhan/action-genai-issue-dedup@v0

.github/workflows/msstore-submissions.yml

@@ -40,7 +40,7 @@ jobs:
           echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT
 
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '9.0.x'
 

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "deps/expected-lite"]
 	path = deps/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git
+[submodule "deps/cziplib"]
+	path = deps/cziplib
+	url = https://github.com/kuba--/zip.git

.pipelines/ESRPSigning_core.json

@@ -115,7 +115,6 @@
             "WinUI3Apps\\PowerToys.FileLocksmithUI.dll",
             "WinUI3Apps\\PowerToys.FileLocksmithContextMenu.dll",
             "FileLocksmithContextMenuPackage.msix",
-            "FileLocksmithCLI.exe",
 
             "WinUI3Apps\\Peek.Common.dll",
             "WinUI3Apps\\Peek.FilePreviewer.dll",

.pipelines/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.PowerToys.Telemetry" version="2.0.4" />
+  <package id="Microsoft.PowerToys.Telemetry" version="2.0.3" />
 </packages>

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

@@ -192,14 +192,14 @@ jobs:
     displayName: Verify XAML formatting
 
   - pwsh: |-
-      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
-    displayName: Verify Nuget package versions for PowerToys.slnx
+      & '.pipelines/verifyNugetPackages.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
+    displayName: Verify Nuget package versions for PowerToys.sln
 
   - pwsh: |-
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\PowerToys.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\BugReportTool\BugReportTool.sln'
       & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\tools\StylesReportTool\StylesReportTool.sln'
-      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.slnx'
+      & '.pipelines/verifyArm64Configuration.ps1' -solution '$(build.sourcesdirectory)\installer\PowerToysSetup.sln'
     displayName: Verify ARM64 configurations
 
   - ${{ if eq(parameters.enablePackageCaching, true) }}:
@@ -252,7 +252,7 @@ jobs:
     ${{ else }}:
       displayName: Build PowerToys main project
     inputs:
-      solution: 'PowerToys.slnx'
+      solution: 'PowerToys.sln'
       vsVersion: 17.0
       msbuildArgs: >-
         -restore -graph
@@ -275,7 +275,7 @@ jobs:
     displayName: Generate DSC artifacts for ARM64
     condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
     inputs:
-      solution: PowerToys.slnx
+      solution: PowerToys.sln
       vsVersion: 17.0
       msbuildArgs: >-
         -restore

.pipelines/v2/templates/job-build-ui-tests.yml

@@ -74,7 +74,7 @@ jobs:
       command: restore
       feedsToUse: config
       configPath: nuget.config
-      restoreSolution: PowerToys.slnx
+      restoreSolution: PowerToys.sln
       restoreDirectory: '$(Build.SourcesDirectory)\packages'
 
   # Build all UI test projects if no specific modules are specified
@@ -129,4 +129,4 @@ jobs:
   - publish: $(JobOutputDirectory)
     artifact: $(JobOutputArtifactName)
     displayName: Publish UI Test artifacts
-    condition: always()
+    condition: always()

.pipelines/v2/templates/steps-build-installer-vnext.yml

@@ -35,7 +35,7 @@ steps:
   - task: VSBuild@1
     displayName: Build Shared Support DLLs
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
@@ -74,7 +74,7 @@ steps:
   - task: VSBuild@1
     displayName: 💻 Build VNext MSI
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
@@ -91,7 +91,7 @@ steps:
   - task: VSBuild@1
     displayName: 👤 Build VNext MSI
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysInstallerVNext
@@ -142,7 +142,7 @@ steps:
   - task: VSBuild@1
     displayName: 💻 Build VNext Bootstrapper
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
@@ -159,7 +159,7 @@ steps:
   - task: VSBuild@1
     displayName: 👤 Build VNext Bootstrapper
     inputs:
-      solution: "**/installer/PowerToysSetup.slnx"
+      solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         /t:PowerToysBootstrapperVNext

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -54,13 +54,4 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     restoreSolution: '$(build.sourcesdirectory)\**\*.sln'
-    includeNuGetOrg: false
-
-- task: NuGetCommand@2
-  displayName: 'Restore NuGet packages (slnx)'
-  inputs:
-    command: 'restore'
-    feedsToUse: 'config'
-    nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
-    restoreSolution: '$(build.sourcesdirectory)\**\*.slnx'
-    includeNuGetOrg: false
+    includeNuGetOrg: false

Cpp.Build.props

@@ -26,7 +26,6 @@
   <PropertyGroup Condition="'$(SkipCppCodeAnalysis)' == ''">
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>$(MsbuildThisFileDirectory)\CppRuleSet.ruleset</CodeAnalysisRuleSet>
-    <CAExcludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)</CAExcludePath>
   </PropertyGroup>
 
   <!-- C++ source compile-specific things for all configurations -->
@@ -35,7 +34,7 @@
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
     <VcpkgEnabled>false</VcpkgEnabled>
     <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
-    <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
     <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
     <LinkControlFlowGuard>Guard</LinkControlFlowGuard>

DATA_AND_PRIVACY.md

@@ -243,10 +243,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Event Name</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdNotFound_EnableCmdNotFound</td>
-    <td>Triggered when Command Not Found is enabled or disabled.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.CmdNotFoundInstallEvent</td>
     <td>Triggered when a Command Not Found is installed.</td>
@@ -261,62 +257,6 @@ _If you want to find diagnostic data events in the source code, these two links
   </tr>  
 </table>
 
-### Command Palette
-<table style="width:100%">
-  <tr>
-    <th>Event Name</th>
-    <th>Description</th>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_BeginInvoke</td>
-    <td>Triggered when the Command Palette is launched by the user.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_ColdLaunch</td>
-    <td>Occurs when Command Palette starts for the first time (cold start).</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_OpenPage</td>
-    <td>Triggered when a page is opened within the Command Palette, tracking navigation depth.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_OpenUri</td>
-    <td>Occurs when a URI is opened through the Command Palette, including whether it's a web URL.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_ReactivateInstance</td>
-    <td>Triggered when an existing Command Palette instance is reactivated.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_RunCommand</td>
-    <td>Logs when a command is executed through the Command Palette, including admin elevation status.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPal_RunQuery</td>
-    <td>Triggered when a search query is performed, including result count and duration.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalDismissedOnEsc</td>
-    <td>Occurs when the Command Palette is dismissed by pressing the Escape key.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalDismissedOnLostFocus</td>
-    <td>Triggered when the Command Palette is dismissed due to losing focus.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalHotkeySummoned</td>
-    <td>Logs when the Command Palette is summoned via hotkey, distinguishing between global and context-specific hotkeys.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalInvokeResult</td>
-    <td>Records the result type of a Command Palette invocation.</td>
-  </tr>
-  <tr>
-    <td>Microsoft.PowerToys.CmdPalProcessStarted</td>
-    <td>Triggered when the Command Palette process is started.</td>
-  </tr>
-</table>
-
 ### Crop And Lock
 <table style="width:100%">
   <tr>
@@ -795,10 +735,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Event Name</th>
     <th>Description</th>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.NewPlus_ChangedTemplateLocation</td>
-    <td>Triggered when the template folder location is changed.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.NewPlus_EventCopyTemplate</td>
     <td>Triggered when an item from New+ is created (copied to the current directory).</td>
@@ -807,10 +743,6 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.NewPlus_EventCopyTemplateResult</td>
     <td>Logs the success of item creation (copying).</td>
   </tr>
-  <tr>
-    <td>Microsoft.PowerToys.NewPlus_EventOpenTemplates</td>
-    <td>Triggered when the templates folder is opened.</td>
-  </tr>
   <tr>
     <td>Microsoft.PowerToys.NewPlus_EventShowTemplateItems</td>
     <td>Triggered when the New+ context menu flyout is displayed.</td>
@@ -996,8 +928,12 @@ _If you want to find diagnostic data events in the source code, these two links
     <th>Description</th>
   </tr>
   <tr>
-    <td>Microsoft.PowerToys.ShortcutGuide_GuideSession</td>
-    <td>Logs a Shortcut Guide session including duration and how it was closed.</td>
+    <td>Microsoft.PowerToys.ShortcutGuide_EnableGuide</td>
+    <td>Triggered when Shortcut Guide is enabled.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.ShortcutGuide_HideGuide</td>
+    <td>Occurs when Shortcut Guide is hidden from view.</td>
   </tr>
   <tr>
     <td>Microsoft.PowerToys.ShortcutGuide_Settings</td>

Directory.Packages.props

@@ -69,7 +69,7 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.6901" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />

README.md

@@ -51,20 +51,19 @@ But to get started quickly, choose one of the installation methods below:
 Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysUserSetup-0.96.1-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.1/PowerToysSetup-0.96.1-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysUserSetup-0.95.1-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.95.1/PowerToysSetup-0.95.1-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.96.1-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.96.1-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.96.1-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.96.1-arm64.exe][ptMachineArm64] |
-
+| Per user - x64       | [PowerToysUserSetup-0.95.1-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.95.1-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.95.1-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.95.1-arm64.exe][ptMachineArm64] |
 </details>
 
 <details>
@@ -103,131 +102,156 @@ There are [community driven install methods](./doc/unofficialInstallMethods.md)
 </details>
 
 ## ✨ What's new
-**Version 0.96 (November 2025)**
+**Version 0.95 (October 2025)**
 
 For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
 
 **✨ Highlights**
- - Advanced Paste now supports multiple online and on-device AI model providers: Azure OpenAI, OpenAI, Google Gemini, Mistral, Foundry Local and Ollama.
- - Command Palette received extensive improvements including file search filters, better clipboard history metadata, context-menu styling, and dozens of bug fixes and enhancements.
- - PowerRename can now extract and use photo metadata (EXIF, XMP) in renaming patterns like `%Camera`, `%Lens`, and `%ExposureTime`.
-
-### Advanced Paste
- - Advanced Paste now lets you connect to multiple AI providers instead of being limited to a single OpenAI provider. See [Advanced Paste documentation](https://learn.microsoft.com/windows/powertoys/advanced-paste) for usage.
-
-### Awake
- - The Awake countdown timer now stays accurate over long periods. Thanks [@daverayment](https://github.com/daverayment)!
- - Fixed Awake context menu positioning. The fix removed the conversion of the mouse cursor from screen to client-window coordinates, instead using the raw screen coordinates returned by GetCursorPos; the context menu now appears at the correct screen position. Thanks [@lzandman](https://github.com/lzandman)!
+ - **NEW:** The **Light Switch** utility in PowerToys allows you to automatically switch between light and dark themes in Windows based on the time of day.
+ - Command Palette delivered major search performance gains (new fuzzy matcher and smarter fallbacks) improving relevance and speed.
+ - Peek can now be activated using just the Spacebar!
+ - Find My Mouse added transparent spotlight with independent backdrop opacity, boosting focus and accessibility.
+ - Settings now lets you delete shortcuts entirely and ignore conflicts.
+ - Mouse Pointer Crosshairs gained orientation options (vertical / horizontal / both) for customizable accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - PowerRename fixed enumeration counter skipping ensuring reliable batch renames. Thanks [@daverayment](https://github.com/daverayment)!
+ - ZoomIt restored legacy draw and snipping behaviors, and fixed recording issues, improving reliability. Thanks [@chakrik73](https://github.com/chakrik73)!
 
 ### Command Palette
- - The search field in context menus now matches the look of the Command Palette, with a smoke backdrop and improved padding.
- - Fallback items such as math calculations or the Run command now appear in results more quickly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the command bar updates correctly after navigating to another page and commands are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - The Command Palette settings page has been reorganized. Activation-key options are grouped under an expander and extension settings are framed for improved readability.
- - When you modify a command, its alias, hotkey, and tags now update in the top-level list, keeping the displayed information in sync. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Press `Ctrl + ,` to open Command Palette settings from anywhere. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - You can use `Page Up` and `Page Down` to navigate the list while focus is in the search box. Thanks [@samrueby](https://github.com/samrueby)!
- - Fixed an issue where the search box could disappear when navigating pages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured search text is selected when *Go home when activated* and *Highlight search on activate* are both enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed an issue where Command Palette window occasionally appeared on the taskbar under certain Windows settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured that labels and icons of list items and menu items update when they change. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed visibility of list filters when navigating to a content page. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
- - Added search to the extension list and a link to extensions on the Microsoft Store. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added options to open the Command Palette window at its last position or re-center it.
- - The Command Palette now remembers its window size after restarting.
- - Added a global error handler that logs fatal errors and provides feedback when unexpected failures force Command Palette to close. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Fixed forms and extension settings not showing on some machines due to a missing VC++ runtime.
- - Restored ranking of fallback commands for built-in extensions (Sleep, Shutdown, Windows settings, Web search, etc.). Thanks [@jiripolasek](https://github.com/jiripolasek).
- - Improved and unified labels and texts across the application!
- - Maintainance: Resolved numerous build warnings in Command Palette projects; no user-visible impact. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Maintainance: Fixed a logging issue so exception messages are properly recorded instead of placeholder text, improving troubleshooting. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Applied conditional margin for icon-only tags to tighten layout. Thanks [@samrueby](https://github.com/samrueby)
+ - Improved the reliability of accessing Command Palette settings through PowerToys Settings and executing other x-cmdpal:// protocol commands. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Enabled AOT by default for improved performance while simplifying publish configs.
+ - Replaced service state color dots with play/pause/stop icons for enhanced accessibility. Thanks [@samrueby](https://github.com/samrueby)
+ - Fixed filter dropdown sync and crash by binding SelectedValue and raising UI-thread notifications. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Ensured long links wrap correctly in details view.
+ - Removed animation and enforced minimum width on filter dropdown for clarity. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Restored focus to More button after ESC closes context menu, improving keyboard flow. Thanks [@chatasweetie](https://github.com/chatasweetie)
+ - Marked main and toast windows as tool windows to keep them out of Alt+Tab while preserving style. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed AOT template and theming issues for filter separators. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Introduced grid layouts (small, medium, gallery) for richer page presentation.
+ - Materialized result lists to avoid rescoring overhead.
+ - Disabled problematic selection TextToSuggest behind environment flag.
+ - Major search performance improvements (new fuzzy matcher, smarter fallbacks, fewer exceptions).
+ - Added context menu "Show Details" command when details pane is hidden.
+ - Reduced window flicker by avoiding unnecessary cloaking. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Restored EmptyContent rendering for blank states. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)
+ - Saved new state even if prior app state file was corrupt (better resilience). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Migrated settings window to WinUI TitleBar control. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Prevented crash on duplicate keybindings and simplified matching. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Hotkeys now always respect the “Ignore shortcut in fullscreen” setting. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Hid search box on content pages, improving focus and accessibility, and added Home title. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Blocked Ctrl+I from inserting stray tabs in search box.
+ - Logged HRESULT codes in error logs for deeper diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Advanced font and emoji icon classification and alignment improvements. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Ensured that fallback command icons are visible on the extension settings page. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed breadcrumb margin misalignment (visual polish). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Truncated overly long command labels with ellipsis to prevent overflow.
+ - Added a setting to configure the page transition animation.
+ - Collection of small improvements and nits for Run Commands.
+ - Improved bookmarks performance and experience. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added Ctrl+O shortcut in Clipboard History to open links directly.
+ - Resolved conflict with external software that blocked Command Palette from hiding.
+ - Updated context menu items to reflect name and icon changes, and ensured application icons are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added Alt+Home shortcut to return immediately to the Command Palette home page. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed a crash when displaying code blocks in markdown on detail or content pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Fixed an issue where the search bar icon and title were not updated when rapidly switching pages. Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Improved the appearance of the search box in the context menu.
+
 
 ### Command Palette Extensions
- - Bookmarks: Added hints about bookmark placeholders to the Add/Edit Bookmark form. — Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Bookmarks: Improved migration of bookmarks from older versions and fixed an issue where aliases or keyboard shortcuts could be lost after restart. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Clipboard history: Items shown in Command Palette’s clipboard history now include helpful metadata. For example, image items show dimensions, text files show names and sizes, web links include page titles, and text entries display word counts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - File search: Added filter buttons to show *all items*, *files only*, or *folders only*. Selecting a filter adds `kind:folders` or `kind:not folders` to narrow results.
- - System commands: Replaced the `:red_circle:` placeholder with an actual red-circle emoji so the correct icon appears in the UI. Thanks [@samrueby](https://github.com/samrueby)!
- - WinGet: Search performance feels more responsive because typed input is now processed via a task queue rather than complex cancellation tokens!
- - Window Walker: UWP apps no longer show a "not responding" label when suspended. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Window Walker: Now displays the actual icon of each window rather than using the process icon, improving recognition of PWAs and Python GUIs. Thanks [@Lee-WonJun](https://github.com/Lee-WonJun)!
-- Windows Terminal profiles: Fixed a rare crash in the Windows Terminal extension when the `LOCALAPPDATA` environment variable was missing. The path is now retrieved via a reliable API. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Replaced localized WebSearch setting keys with stable literals and numeric history count. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enabled advanced markdown tables and emphasis extensions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added setting to choose Clipboard History primary action (Paste vs Copy). Thanks [@jiripolasek](https://github.com/jiripolasek)
+ - Added actionable empty-state hints for File Search (search PC / open indexing settings). Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured all WinGet extension assets copy reliably to output. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Improved Run command line parsing for paths with spaces; sped up related tests.
+ - Updated WebSearch extension icon set for enhanced clarity and contrast. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Terminal profile sort order setting including MRU tracking. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Uninstall Application command (UWP direct, Win32 via Settings). Thanks [@mKpwnz](https://github.com/mKpwnz)!
+ - Deferred WinGet details loading and added timing logs.
+ - Removed LINQ from All Apps extension for performance.
+ - Added standardized key chord system + shortcuts to File Search commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added Terminal channel filter & remembered selection option. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Enabled loading local/data/app images in markdown with sizing hints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added external extension reload via x-cmdpal://reload (configurable). Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Instant WebSearch history updates with in-memory store & events. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added keep-after-paste option and safe delete with confirmation for Clipboard History. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+
+### Environment Variables
+ - Replaced custom window chrome with WinUI TitleBar for cleaner, maintainable Environment Variables UI.
+
+### File Locksmith
+ - Adopted WinUI TitleBar to simplify window chrome while preserving appearance.
 
 ### Find My Mouse
- - Activating Find My Mouse no longer makes the cursor change to the busy (hourglass) icon or steals focus from your active application.
+ - Added transparent spotlight support with separate backdrop opacity; migrated to Windows App SDK composition APIs.
 
 ### Hosts File Editor
- - Added customizable backup settings allowing users to configure backup frequency, location, and auto-deletion policies. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Image Resizer
- - Fixed settings consistency during batch resize operations by capturing settings once before processing. Thanks [@daverayment](https://github.com/daverayment)!
+ - Migrated to native WinUI TitleBar for cleaner, maintainable window chrome.
 
 ### Light Switch
-- Introduced new UI to allow users to manually enter their latitude and longitude in Sunrise to Sunset mode.
-- Refactored service with cleaner state management for stability.
-- Removed logs from every tick, only logging key events to largely reduce log size.
+ - Introduced as a brand-new PowerToy module.
+ - Automatically switches between light and dark themes.
+ - Supports time-based scheduling or location-based sunrise/sunset switching.
+ - Supports using a keyboard shortcut to force a change.
+ - Supports filtering changes for Apps and/or System Theme.
 
 ### Mouse Pointer Crosshairs
- - Enabled switching between Mouse Pointer Crosshairs and Gliding Cursor modes. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Added Esc key to cancel active gliding cursor sequence. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+ - Added orientation option (vertical / horizontal / both) for crosshairs customization. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
 
 ### Mouse Without Borders
- - Added horizontal scrolling support. Thanks [@MasonBergstrom](https://github.com/MasonBergstrom)!
+ - Continued Common class refactor (part 5/7) by extracting clipboard and init/cleanup logic into focused classes. Thanks [@mikeclayton](https://github.com/mikeclayton)!
+
+ - Fix connection failures caused by conflicting MachineId across machines.  Thanks [@noraa-junker](https://github.com/noraa-junker) for troubleshooting!
 
 ### Peek
-- Fixed media files remaining locked after preview window closes. Thanks [@daverayment](https://github.com/daverayment)!
-- Added a command-line interface for file previewing. See the [Peek documentation](https://learn.microsoft.com/windows/powertoys/peek) for usage. Thanks [@prochan2](https://github.com/prochan2)!
+ - Added the option to activate Peek with just the Spacebar.
 
 ### PowerRename
-- PowerRename no longer crashes due to a missing resources file.
-- Added photo metadata extraction support using EXIF and XMP for pattern-based renaming with camera info, GPS coordinates, and date taken. See [PowerRename Documentation](https://learn.microsoft.com/en-us/windows/powertoys/powerrename).
+ - Fixed enumeration counter skipping when regex replacement equals original filename (counters now advance reliably). Thanks [@daverayment](https://github.com/daverayment)!
 
-### PowerToys Run
- - Added retry logic with exponential backoff to handle DWM composition errors during theme changes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Updated OneNote icons to reflect new Microsoft 365 design. Thanks [@trevorNgo](https://github.com/trevorNgo)!
+### Quick Accent
+ - Expanded Welsh layout with acute, grave, and dieresis variants for vowels (consistent ordering). Thanks [@PesBandi](https://github.com/PesBandi)!
 
- ### Quick Accent
- - Added diameter symbol (⌀) for Shift+O in Special Characters mode, thanks to [@anselumjuju](https://github.com/anselumjuju)!
+### Registry Preview
+ - Migrated to native TitleBar and AppWindow APIs for cleaner window chrome.
 
-### Zoomit
- - Smoothed out zoom-animation in ZoomIt by coalescing mouse-move and timer events, thanks to [@foxmsft](https://github.com/foxmsft)!
- - Enabled GIF support for ZoomIt, thanks to [@MarioHewardt](https://github.com/MarioHewardt)!
- - Fixed spelling mistakes, and refactored some literal strings to string constants, thanks to [@lzandman](https://github.com/lzandman)!
- - Fixed inaccurate "actual size" screenshots in ZoomIt and resolves a GDI handle leak, improving capture fidelity and long-session stability. thanks to [@daverayment](https://github.com/daverayment)!
+### Screen Ruler
+ - Fixed ARM64 crash by aligning cursor position structure to 8-byte boundary.
 
 ### Settings
-- Fixed title bar overlapping issue at smaller window sizes.
-- Refined shortcut control visual design with improved consistency and spacing.
-- Added dashboard utilities sorting by name or status.
-- Made update notification InfoBar in flyout clickable for direct navigation to update page.
-- Expanded installation instructions by default in README.
-- Improved accessibility for shortcut conflict button with static resource-based automation properties.
-- Added ScrollViewer to Command Palette page in PowerToys Settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Fixed module list glitches and Sort Status checkmark issue. Thanks [@daverayment](https://github.com/daverayment)!
+ - Added ability to ignore specific hotkey conflicts to reduce noise.
+ - Stopped creating backup directory during dry-run status checks (cleaner first-run). 
+ - Standardized casing and localization for ZoomIt and modules header.
+ - Improved search results page accessibility and conditional module grouping.
 
-### Development
-- Fixed accessibility by associating controls with labels for screen readers.
-- Added accessible name to Shortcut Conflicts button for screen readers.
-- Excluded TitleBars from tab navigation across multiple utilities. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Migrated build infrastructure from Windows Server 2019 to Server 2022 with improved failure logging and predictable NuGet package paths.
-- Configured build agents to use larger P: drive for release builds to address disk space constraints.
-- Enhanced DSC v3 support by organizing resource manifests in a dedicated subfolder with PATH configuration.
-- Reduced installer bundle size by 6-7MB through centralized Hybrid CRT configuration across all C++ projects.
-- Updated .NET packages to version 9.0.10 for security fixes. Thanks [@snickler](https://github.com/snickler)!
-- Fixed spell check dictionary entries for consistency.
-- Restored accidentally deleted NuGet configuration file for Command Palette extensions.
-- Fixed package identity build by updating AppxManifest entry points to use PowerShell Core.
-- Optimized CI pipeline by replacing file copy operations with hard links and moves, reducing build time and disk usage by 10-15GB.
-- Updated Copilot guidance and PR prompt workflow.
-- Included high-volume bugs in issue template header. Thanks [@daverayment](https://github.com/daverayment)!
-- Fixed incorrect HRESULT logging for inner exceptions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
-- Introduced shared sparse package identity for PowerToys Win32 components to enable access to Windows platform APIs.
-- Consolidated installer builds to produce both machine and user installers simultaneously, reducing build time and complexity.
-- Migrated exclusively to WiX v5 installer infrastructure, removing legacy WiX v3 support.
-- Temporarily removed PowerToys installer path from PATH environment variable to prevent application crashes.
-- Added complete OCR UI test coverage with automated tests for activation, settings, language selection, and text extraction.
-- Fixed test input for drive path normalization in bookmark resolver unit tests.
-- Fixed Peek UI tests by restoring Ctrl+Space activation shortcut for test scenarios.
-- Hided apps in PowerToys.SpareApps package from Start Menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+### ZoomIt
+ - Updated resource file to reflect standalone v9.01 and current copyright year. Thanks [@foxmsft](https://github.com/foxmsft)!
+ - Restored legacy draw/snipping behaviors and fixed recording race conditions. Thanks [@chakrik73](https://github.com/chakrik73)!
+ - Added smooth image option for improved zoom quality using GDI+ for static zoom and Magnifier API for live zoom. Thanks [@markrussinovich](https://github.com/markrussinovich)!
+
+ ### Documentation
+ - New Microsoft Learn documentation for the Light Switch module.
+ - New dev docs for the Light Switch module.
+
+### Development (Area-Build & Area-Tests) 
+- Allowed debug launches to continue when modules fail to load, speeding developer iteration. 
+- Fixed spell checker dictionary entry (advapi) to eliminate false error. 
+- Added VS Code development guide and launch configs to streamline cross-editor workflows. 
+- Upgraded Windows App SDK and related dependencies to 1.8 for newer platform features. 
+- Rewrote YAML comment to resolve new spell checker forbidden pattern. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
+- Corrected solution structure by returning misplaced Common project, reducing build confusion. 
+- Modernized build scripts with shared helpers and VS environment autodetection for simpler CLI builds. 
+- Standardized build scripts and platform detection to improve reliability and reuse. 
+- Added missing Command Palette version bump to align module release cadence. 
+- Added EXECUTEDEFAULT term to dictionary to prevent regression build failures. Thanks [@jiripolasek](https://github.com/jiripolasek)! 
+- Introduced nightly pre-warm pipeline and configurable MSBuild cache mode to improve CI performance. 
+- Resolved CI forbidden pattern spelling complaint to keep pipelines green. 
+- Added AI contributor instruction set to clarify code area expectations. 
+- Added accessibility IDs to settings and FancyZones toggles, stabilizing UI tests. 
+- Added automatic log collection on UI test failures to speed root cause analysis. 
+- Stabilized Mouse Utils tests by switching to AccessibilityId selectors. 
+- Added Screen Ruler UI test coverage to validate core measurement workflows. 
 
 ## 🛣️ Roadmap 
 We are planning some nice new features and improvements for the next releases – a revamped Keyboard Manager UI, custom endpoint and local model support for Advanced Paste, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.96][github-next-release-work]!

doc/devdocs/core/installer.md

@@ -134,7 +134,7 @@ If you prefer, you can alternatively build prerequisite projects for the install
 
 #### Locally compiling the installer
 
-1. Open `installer\PowerToysSetup.slnx`
+1. Open `installer\PowerToysSetup.sln`
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu choose `Build Solution`.
 
@@ -144,9 +144,9 @@ To build the installer from the command line, run `Developer Command Prompt for
 
 ```
 git clean -xfd  -e *exe -- .\installer\
-MSBuild -t:restore  .\installer\PowerToysSetup.slnx -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
-MSBuild -t:Restore -m .\installer\PowerToysSetup.slnx /t:PowerToysInstallerVNext /p:Configuration=Release /p:Platform="x64"
-MSBuild -t:Restore -m .\installer\PowerToysSetup.slnx /t:PowerToysBootstrapperVNext /p:Configuration=Release /p:Platform="x64" 
+MSBuild -t:restore  .\installer\PowerToysSetup.sln -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
+MSBuild -t:Restore -m .\installer\PowerToysSetup.sln /t:PowerToysInstallerVNext /p:Configuration=Release /p:Platform="x64"
+MSBuild -t:Restore -m .\installer\PowerToysSetup.sln /t:PowerToysBootstrapperVNext /p:Configuration=Release /p:Platform="x64" 
 ```
 
 ### Supported arguments for the .EXE Bootstrapper installer

doc/devdocs/development/debugging.md

@@ -19,7 +19,7 @@ You can build the entire solution from the command line, which is sometimes fast
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
    ```pwsh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.slnx /tl /p:NuGetInteractive="true"
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln /tl /p:NuGetInteractive="true"
    ```
 4. This process should complete in approximately 13-14 minutes for a full build
 

doc/devdocs/development/dev-with-vscode.md

@@ -42,10 +42,10 @@ Or reach out to "tools\build\BUILD-GUIDELINES.md"
 ### Sample plain msbuild command
 ```powershell
 # Restore:
-msbuild powertoys.slnx -t:restore -p:configuration=debug -p:platform=x64 -m
+msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
 
-# Build powertoys slnx
-msbuild powertoys.slnx -p:configuration=debug -p:platform=x64 -m
+# Build powertoys sln
+msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
 
 # dotnet project
 msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
@@ -122,7 +122,7 @@ Similar for attach to managed code.
 
 | Task | Command / Action | Notes |
 |------|------------------|-------|
-| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.slnx` | Deep clean removes packages & build outputs |
+| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
 | Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
 | Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
-| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |
+| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |

doc/devdocs/development/ui-tests.md

@@ -12,7 +12,7 @@
 
 - Exit PowerToys if it's running.
 
-- Open `PowerToys.slnx` in Visual Studio and build the solution.
+- Open `PowerToys.sln` in Visual Studio and build the solution.
 
 - Run tests in the Test Explorer (`Test > Test Explorer` or `Ctrl+E, T`).
 

doc/devdocs/modules/alwaysontop.md

@@ -86,7 +86,7 @@ The module provides a user interface for configuring settings in the PowerToys S
 ### Building and Testing
 
 1. Clone the repository: `git clone https://github.com/microsoft/PowerToys.git`
-2. Open PowerToys.slnx in Visual Studio
+2. Open PowerToys.sln in Visual Studio
 3. Select the Release configuration and build the solution
 4. Run PowerToys.exe from the output directory to test the module
 

doc/devdocs/modules/fancyzones.md

@@ -161,7 +161,7 @@ FancyZones is divided into several projects:
    ```
    git clone https://github.com/microsoft/PowerToys.git
    ```
-2. Open `PowerToys.slnx` in Visual Studio
+2. Open `PowerToys.sln` in Visual Studio
 3. Select the Release configuration and build the solution
 4. If you encounter build errors, try deleting the x64 output folder and rebuild
 
@@ -244,7 +244,7 @@ UI tests are implemented using [Windows Application Driver](https://github.com/m
   
   - Exit PowerToys if it's running
   - Run WinAppDriver.exe from the installation directory. Skip this step if installed in the default directory (`C:\Program Files (x86)\Windows Application Driver`); in this case, it'll be launched automatically during tests.
-  - Open `PowerToys.slnx` in Visual Studio and build the solution.
+  - Open `PowerToys.sln` in Visual Studio and build the solution.
   - Run tests in the Test Explorer (`Test > Test Explorer` or `Ctrl+E, T`). 
 
 >Note: notifications or other application windows, that are shown above the window under test, can disrupt the testing process.

doc/devdocs/modules/keyboardmanager/debug.md

@@ -11,7 +11,7 @@ Keyboard Manager consists of two main components:
 ## Development Environment Setup
 
 1. Clone the PowerToys repository
-2. Open `PowerToys.slnx` in Visual Studio
+2. Open `PowerToys.sln` in Visual Studio
 3. Ensure all NuGet packages are restored
 4. Build the entire solution in Debug configuration
 
@@ -91,4 +91,4 @@ If you encounter issues with multiple instances, check the mutex logic in `Keybo
 
 To debug both the Editor and Engine:
 1. Launch the Engine first in debug mode
-2. Attach the debugger to the Editor process when it starts
+2. Attach the debugger to the Editor process when it starts

doc/devdocs/modules/lightswitch.md

@@ -33,12 +33,9 @@ The **Light Switch** module lets users automatically transition between light an
 
   > **Note:** Using the shortcut overrides the current schedule until the next transition event.
 
-* **LightSwitchService.cpp**
-  is the heart beat of the module. Controls ticking every minute and depending on user actions (manual override, settings changing, etc) triggers the state manager to perform the corresponding operation.
-  
-* **LightSwitchStateManager.cpp**
-  handles updating the state based on the signals sent by LightSwitchService.
-  
+* **LightSwitchService**
+  Reads settings and applies theming. Runs a check every minute to ensure the state is correct.
+
 * **SettingsXAML/LightSwitch**
   Provides the settings UI for configuring schedules, syncing location, and customizing shortcuts.
 
@@ -92,7 +89,7 @@ The module’s settings are exposed in the PowerToys Settings UI. Options includ
 3. Build the solution:
 
    ```sh
-   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.slnx
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
    ```
 
    > Note: This may take some time.

doc/devdocs/modules/screenruler.md

@@ -53,7 +53,7 @@ The Screen Ruler module consists of several components:
 
 ### Building
 
-1. Open PowerToys.slnx in Visual Studio
+1. Open PowerToys.sln in Visual Studio
 2. In the Solutions Configuration drop-down menu, select Release or Debug
 3. From the Build menu, choose Build Solution
 4. The executable app for Screen Ruler is named PowerToys.MeasureToolUI.exe

doc/devdocs/modules/shortcut_guide.md

@@ -19,7 +19,7 @@ Shortcut Guide is a PowerToy that displays an overlay of available keyboard shor
 ## Build and Debug Instructions
 
 ### Build
-1. Open PowerToys.slnx in Visual Studio
+1. Open PowerToys.sln in Visual Studio
 2. Select Release or Debug in the Solutions Configuration drop-down menu
 3. From the Build menu, choose Build Solution
 4. The executable is named PowerToys.ShortcutGuide.exe

doc/devdocs/readme.md

@@ -80,7 +80,7 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and an
 
 ### Install Visual Studio dependencies
 
-1. Open the `PowerToys.slnx` file.
+1. Open the `PowerToys.sln` file.
 1. If you see a dialog that says `install extra components` in the solution explorer pane, click `install`
 
 ### Get Submodules to compile
@@ -93,7 +93,7 @@ We have submodules that need to be initialized before you can compile most parts
 
 ### Compiling Source Code
 
-- Open `PowerToys.slnx` in Visual Studio.
+- Open `PowerToys.sln` in Visual Studio.
 - In the `Solutions Configuration` drop-down menu select `Release` or `Debug`.
 - From the `Build` menu choose `Build Solution`, or press <kbd>Control</kbd>+<kbd>Shift</kbd>+<kbd>b</kbd> on your keyboard.
 - The build process may take several minutes depending on your computer's performance. Once it completes, the PowerToys binaries will be in your repo under `x64\Release\`.
@@ -107,10 +107,10 @@ Our installer is two parts, an EXE and an MSI.  The EXE (Bootstrapper) contains
 
 The installer can only be compiled in `Release` mode; steps 1 and 2 must be performed before the MSI can be compiled.
 
-1. Compile `PowerToys.slnx`. Instructions are listed above.
+1. Compile `PowerToys.sln`. Instructions are listed above.
 1. Compile `BugReportTool.sln` tool. Path from root: `tools\BugReportTool\BugReportTool.sln` (details listed below)
 1. Compile `StylesReportTool.sln` tool. Path from root: `tools\StylesReportTool\StylesReportTool.sln` (details listed below)
-1. Compile `PowerToysSetup.slnx` Path from root: `installer\PowerToysSetup.slnx` (details listed below)
+1. Compile `PowerToysSetup.sln` Path from root: `installer\PowerToysSetup.sln` (details listed below)
 
 See [Installer](core/installer.md) for more details on building and debugging the installer.
 

installer/PowerToysSetup.sln

@@ -0,0 +1,96 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32414.318
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "..\src\common\logger\logger.vcxproj", "{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysInstallerVNext", "PowerToysSetupVNext\PowerToysInstallerVNext.wixproj", "{B6E94700-DF38-41F6-A3FD-18B69674AB1E}"
+EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysBootstrapperVNext", "PowerToysSetupVNext\PowerToysBootstrapperVNext.wixproj", "{DA4E9744-80BE-424C-B0F5-AFD8757DB575}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToysSetupCustomActionsVNext", "PowerToysSetupCustomActionsVNext\PowerToysSetupCustomActionsVNext.vcxproj", "{B3A354B0-1E54-4B55-A962-FB5AF9330C19}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SilentFilesInUseBAFunction", "PowerToysSetupVNext\SilentFilesInUseBA\SilentFilesInUseBAFunction.vcxproj", "{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|ARM64.Build.0 = Release|ARM64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.ActiveCfg = Release|x64
+		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.Build.0 = Release|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.ActiveCfg = Debug|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Debug|x64.Build.0 = Debug|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|ARM64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.ActiveCfg = Release|x64
+		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.Build.0 = Release|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.ActiveCfg = Debug|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.Build.0 = Debug|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|ARM64.Build.0 = Release|ARM64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.ActiveCfg = Release|x64
+		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Release|x64.Build.0 = Release|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|x64.ActiveCfg = Debug|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|x64.Build.0 = Debug|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|ARM64.Build.0 = Release|ARM64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.ActiveCfg = Release|x64
+		{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Release|x64.Build.0 = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|ARM64.Build.0 = Debug|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.ActiveCfg = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Debug|x64.Build.0 = Debug|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|ARM64.Build.0 = Release|ARM64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.ActiveCfg = Release|x64
+		{B6E94700-DF38-41F6-A3FD-18B69674AB1E}.Release|x64.Build.0 = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|ARM64.Build.0 = Debug|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.ActiveCfg = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Debug|x64.Build.0 = Debug|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.ActiveCfg = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|ARM64.Build.0 = Release|ARM64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.ActiveCfg = Release|x64
+		{DA4E9744-80BE-424C-B0F5-AFD8757DB575}.Release|x64.Build.0 = Release|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|x64.ActiveCfg = Debug|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Debug|x64.Build.0 = Debug|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|ARM64.ActiveCfg = Release|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|ARM64.Build.0 = Release|ARM64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|x64.ActiveCfg = Release|x64
+		{B3A354B0-1E54-4B55-A962-FB5AF9330C19}.Release|x64.Build.0 = Release|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|x64.ActiveCfg = Debug|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Debug|x64.Build.0 = Debug|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|ARM64.Build.0 = Release|ARM64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|x64.ActiveCfg = Release|x64
+		{F8B9F842-F5C3-4A2D-8C85-7F8B9E2B4F1D}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B7A3DA30-D443-40FF-AC51-988AD41E3962}
+	EndGlobalSection
+EndGlobal

installer/PowerToysSetup.slnx

@@ -1,22 +0,0 @@
-<Solution>
-  <Configurations>
-    <Platform Name="ARM64" />
-    <Platform Name="x64" />
-  </Configurations>
-  <Project Path="../src/common/logger/logger.vcxproj" Id="d9b8fc84-322a-4f9f-bbb9-20915c47ddfd">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="../src/common/Telemetry/EtwTrace/EtwTrace.vcxproj" Id="8f021b46-362b-485c-bfba-ccf83e820cbd" />
-  <Project Path="../src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
-  <Project Path="../src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj" Id="b3a354b0-1e54-4b55-a962-fb5af9330c19">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-  <Project Path="PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/PowerToysInstallerVNext.wixproj" Type="b7dd6f7e-def8-4e67-b5b7-07ef123db6f0" />
-  <Project Path="PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj" Id="f8b9f842-f5c3-4a2d-8c85-7f8b9e2b4f1d">
-    <Build Solution="Debug|ARM64" Project="false" />
-  </Project>
-</Solution>

src/common/ManagedCommon/Logger.cs

@@ -31,11 +31,6 @@ namespace ManagedCommon
         /// </summary>
         public static string CurrentVersionLogDirectoryPath { get; private set; }
 
-        /// <summary>
-        /// Gets the path to the current log file.
-        /// </summary>
-        public static string CurrentLogFile { get; private set; }
-
         /// <summary>
         /// Gets the path to the log directory for the app.
         /// </summary>
@@ -60,9 +55,7 @@ namespace ManagedCommon
             AppLogDirectoryPath = basePath;
             CurrentVersionLogDirectoryPath = versionedPath;
 
-            var logFile = "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log";
-            var logFilePath = Path.Combine(versionedPath, logFile);
-            CurrentLogFile = logFilePath;
+            var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{49D456D3-F485-45AF-8875-45B44F193DDC}</ProjectGuid>
-    <RootNamespace>FileLocksmithCLI</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>FileLocksmithCLI</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>..\..\..\..\$(Platform)\$(Configuration)</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RunCodeAnalysis>false</RunCodeAnalysis>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>false</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir)..;$(ProjectDir)..\..\..;$(ProjectDir)..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RunCodeAnalysis>false</RunCodeAnalysis>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>shlwapi.lib;ntdll.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\FileLocksmithLib\FileLocksmithLib.vcxproj">
-      <Project>{9d52fd25-ef90-4f9a-a015-91efc5daf54f}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-</Project>

src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj.filters

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-</Project>

src/modules/FileLocksmith/FileLocksmithCLI/main.cpp

@@ -1,189 +0,0 @@
-#include "pch.h"
-#include "FileLocksmithLib/FileLocksmith.h"
-#include <common/utils/json.h>
-#include <iostream>
-#include <sstream>
-
-struct CommandResult
-{
-    int exit_code;
-    std::wstring output;
-};
-
-std::wstring get_usage()
-{
-    std::wstringstream ss;
-    ss << L"Usage: FileLocksmithCLI.exe [options] <path1> [path2] ...\n"
-       << L"Options:\n"
-       << L"  --kill      Kill processes locking the files\n"
-       << L"  --json      Output results in JSON format\n"
-       << L"  --wait      Wait for files to be unlocked\n"
-       << L"  --help      Show this help message\n";
-    return ss.str();
-}
-
-std::wstring get_json(const std::vector<ProcessResult>& results)
-{
-    json::JsonObject root;
-    json::JsonArray processes;
-
-    for (const auto& result : results)
-    {
-        json::JsonObject process;
-        process.SetNamedValue(L"pid", json::JsonValue::CreateNumberValue(result.pid));
-        process.SetNamedValue(L"name", json::JsonValue::CreateStringValue(result.name));
-        process.SetNamedValue(L"user", json::JsonValue::CreateStringValue(result.user));
-        
-        json::JsonArray files;
-        for (const auto& file : result.files)
-        {
-            files.Append(json::JsonValue::CreateStringValue(file));
-        }
-        process.SetNamedValue(L"files", files);
-        
-        processes.Append(process);
-    }
-
-    root.SetNamedValue(L"processes", processes);
-    return root.Stringify().c_str();
-}
-
-std::wstring get_text(const std::vector<ProcessResult>& results)
-{
-    std::wstringstream ss;
-    if (results.empty())
-    {
-        ss << L"No processes found locking the file(s)." << std::endl;
-        return ss.str();
-    }
-
-    ss << L"PID\tUser\tProcess" << std::endl;
-    for (const auto& result : results)
-    {
-        ss << result.pid << L"\t" 
-           << result.user << L"\t" 
-           << result.name << std::endl;
-    }
-    return ss.str();
-}
-
-std::wstring kill_processes(const std::vector<ProcessResult>& results)
-{
-    std::wstringstream ss;
-    for (const auto& result : results)
-    {
-        HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, result.pid);
-        if (hProcess)
-        {
-            if (TerminateProcess(hProcess, 0))
-            {
-                ss << L"Terminated process " << result.pid << L" (" << result.name << L")" << std::endl;
-            }
-            else
-            {
-                ss << L"Failed to terminate process " << result.pid << L" (" << result.name << L")" << std::endl;
-            }
-            CloseHandle(hProcess);
-        }
-        else
-        {
-            ss << L"Failed to open process " << result.pid << L" (" << result.name << L")" << std::endl;
-        }
-    }
-    return ss.str();
-}
-
-CommandResult run_command(int argc, wchar_t* argv[])
-{
-    if (argc < 2)
-    {
-        return { 1, get_usage() };
-    }
-
-    bool json_output = false;
-    bool kill = false;
-    bool wait = false;
-    std::vector<std::wstring> paths;
-
-    for (int i = 1; i < argc; ++i)
-    {
-        std::wstring arg = argv[i];
-        if (arg == L"--json")
-        {
-            json_output = true;
-        }
-        else if (arg == L"--kill")
-        {
-            kill = true;
-        }
-        else if (arg == L"--wait")
-        {
-            wait = true;
-        }
-        else if (arg == L"--help")
-        {
-            return { 0, get_usage() };
-        }
-        else
-        {
-            paths.push_back(arg);
-        }
-    }
-
-    if (paths.empty())
-    {
-        return { 1, L"Error: No paths specified.\n" };
-    }
-
-    if (wait)
-    {
-        std::wstringstream ss;
-        if (json_output)
-        {
-             ss << L"Warning: --wait is incompatible with --json. Ignoring --json." << std::endl;
-             json_output = false;
-        }
-        
-        ss << L"Waiting for files to be unlocked..." << std::endl;
-        while (true)
-        {
-            auto results = find_processes_recursive(paths);
-            if (results.empty())
-            {
-                ss << L"Files unlocked." << std::endl;
-                break;
-            }
-            Sleep(1000);
-        }
-        return { 0, ss.str() };
-    }
-
-    auto results = find_processes_recursive(paths);
-    std::wstringstream output_ss;
-
-    if (kill)
-    {
-        output_ss << kill_processes(results);
-        // Re-check after killing
-        results = find_processes_recursive(paths);
-    }
-
-    if (json_output)
-    {
-        output_ss << get_json(results) << std::endl;
-    }
-    else
-    {
-        output_ss << get_text(results);
-    }
-
-    return { 0, output_ss.str() };
-}
-
-int wmain(int argc, wchar_t* argv[])
-{
-    winrt::init_apartment();
-    auto result = run_command(argc, argv);
-    std::wcout << result.output;
-    return result.exit_code;
-}

src/modules/FileLocksmith/FileLocksmithCLI/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>

src/modules/FileLocksmith/FileLocksmithCLI/pch.cpp

@@ -1 +0,0 @@
-#include "pch.h"

src/modules/FileLocksmith/FileLocksmithCLI/pch.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifndef PCH_H
-#pragma once
-
-#ifndef PCH_H
-#define PCH_H
-
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <winternl.h>
-#include <Psapi.h>
-#include <shellapi.h>
-
-#include <iostream>
-#include <vector>
-#include <string>
-#include <map>
-#include <set>
-#include <algorithm>
-
-#include <winrt/base.h>
-
-#endif // PCH_H
-
-
-#endif // PCH_H
-

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmith.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include "ProcessResult.h"
-
-// Second version, checks handles towards files and all subfiles and folders of given dirs, if any.
-std::vector<ProcessResult> find_processes_recursive(const std::vector<std::wstring>& paths);
-
-// Gives the full path of the executable, given the process id
-std::wstring pid_to_full_path(DWORD pid);

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj

@@ -34,9 +34,9 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;FILELOCKSMITH_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\FileLocksmithLibInterop;../../..;../..;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..;../..;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -50,9 +50,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;FILELOCKSMITH_LIB_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>..\FileLocksmithLibInterop;../../..;../..;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../..;../..;</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>
@@ -68,15 +68,13 @@
     <ClInclude Include="Settings.h" />
     <ClInclude Include="Trace.h" />
     <ClInclude Include="framework.h" />
+    <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="IPC.cpp" />
     <ClCompile Include="Settings.cpp" />
     <ClCompile Include="Trace.cpp" />
     <ClCompile Include="FileLocksmithLib.cpp" />
-    <ClCompile Include="..\FileLocksmithLibInterop\FileLocksmith.cpp" />
-    <ClCompile Include="..\FileLocksmithLibInterop\NtdllBase.cpp" />
-    <ClCompile Include="..\FileLocksmithLibInterop\NtdllExtensions.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>

src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj.filters

@@ -38,15 +38,6 @@
     <ClCompile Include="FileLocksmithLib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="FileLocksmith.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NtdllBase.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NtdllExtensions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>

src/modules/FileLocksmith/FileLocksmithLib/ProcessResult.h

@@ -1,12 +0,0 @@
-#pragma once
-#include <string>
-#include <vector>
-#include <Windows.h>
-
-struct ProcessResult
-{
-    std::wstring name;
-    DWORD pid;
-    std::wstring user;
-    std::vector<std::wstring> files;
-};

src/modules/FileLocksmith/FileLocksmithLib/Settings.cpp

@@ -2,7 +2,6 @@
 #include "Settings.h"
 #include "Constants.h"
 
-#include <filesystem>
 #include <common/utils/json.h>
 #include <common/SettingsAPI/settings_helpers.h>
 

src/modules/FileLocksmith/FileLocksmithLib/pch.h

@@ -0,0 +1,13 @@
+// pch.h: This is a precompiled header file.
+// Files listed below are compiled only once, improving build performance for future builds.
+// This also affects IntelliSense performance, including code completion and many code browsing features.
+// However, files listed here are ALL re-compiled if any one of them is updated between builds.
+// Do not add files here that you will be updating frequently as this negates the performance advantage.
+
+#ifndef PCH_H
+#define PCH_H
+
+// add headers that you want to pre-compile here
+#include "framework.h"
+
+#endif //PCH_H

src/modules/FileLocksmith/FileLocksmithLibInterop/pch.h

@@ -18,6 +18,4 @@
 #include <algorithm>
 #include <fstream>
 
-#ifndef FILELOCKSMITH_LIB_STATIC
 #include <winrt/PowerToys.Interop.h>
-#endif

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

@@ -0,0 +1,248 @@
+// 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.
+
+// <summary>
+//     Encrypt/decrypt implementation.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using System;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Threading.Tasks;
+
+using MouseWithoutBorders.Core;
+
+namespace MouseWithoutBorders
+{
+    internal partial class Common
+    {
+#pragma warning disable SYSLIB0021
+        private static AesCryptoServiceProvider symAl;
+#pragma warning restore SYSLIB0021
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static string myKey;
+#pragma warning restore SA1307
+        private static uint magicNumber;
+        private static Random ran = new(); // Used for non encryption related functionality.
+        internal const int SymAlBlockSize = 16;
+
+        /// <summary>
+        /// This is used for the first encryption block, the following blocks will be combined with the cipher text of the previous block.
+        /// Thus identical blocks in the socket stream would be encrypted to different cipher text blocks.
+        /// The first block is a handshake one containing random data.
+        /// Related Unit Test: TestEncryptDecrypt
+        /// </summary>
+        internal static readonly string InitialIV = ulong.MaxValue.ToString(CultureInfo.InvariantCulture);
+
+        internal static Random Ran
+        {
+            get => Common.ran ??= new Random();
+            set => Common.ran = value;
+        }
+
+        internal static uint MagicNumber
+        {
+            get => Common.magicNumber;
+            set => Common.magicNumber = value;
+        }
+
+        internal static string MyKey
+        {
+            get => Common.myKey;
+
+            set
+            {
+                if (Common.myKey != value)
+                {
+                    Common.myKey = value;
+                    _ = Task.Factory.StartNew(
+                        () => Common.GenLegalKey(),
+                        System.Threading.CancellationToken.None,
+                        TaskCreationOptions.None,
+                        TaskScheduler.Default); // Cache the key to improve UX.
+                }
+            }
+        }
+
+        internal static string KeyDisplayedText(string key)
+        {
+            string displayedValue = string.Empty;
+            int i = 0;
+
+            do
+            {
+                int length = Math.Min(4, key.Length - i);
+                displayedValue += string.Concat(key.AsSpan(i, length), "  ");
+                i += 4;
+            }
+            while (i < key.Length - 1);
+
+            return displayedValue.Trim();
+        }
+
+        internal static bool GeneratedKey { get; set; }
+
+        internal static bool KeyCorrupted { get; set; }
+
+        internal static void InitEncryption()
+        {
+            try
+            {
+                if (symAl == null)
+                {
+#pragma warning disable SYSLIB0021 // No proper replacement for now
+                    symAl = new AesCryptoServiceProvider();
+#pragma warning restore SYSLIB0021
+                    symAl.KeySize = 256;
+                    symAl.BlockSize = SymAlBlockSize * 8;
+                    symAl.Padding = PaddingMode.Zeros;
+                    symAl.Mode = CipherMode.CBC;
+                    symAl.GenerateIV();
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+        private static readonly ConcurrentDictionary<string, byte[]> LegalKeyDictionary = new(StringComparer.OrdinalIgnoreCase);
+
+        internal static byte[] GenLegalKey()
+        {
+            byte[] rv;
+            string myKey = Common.MyKey;
+
+            if (!LegalKeyDictionary.TryGetValue(myKey, out byte[] value))
+            {
+                Rfc2898DeriveBytes key = new(
+                    myKey,
+                    Common.GetBytesU(InitialIV),
+                    50000,
+                    HashAlgorithmName.SHA512);
+                rv = key.GetBytes(32);
+                _ = LegalKeyDictionary.AddOrUpdate(myKey, rv, (k, v) => rv);
+            }
+            else
+            {
+                rv = value;
+            }
+
+            return rv;
+        }
+
+        private static byte[] GenLegalIV()
+        {
+            string st = InitialIV;
+            int ivLength = symAl.IV.Length;
+            if (st.Length > ivLength)
+            {
+                st = st[..ivLength];
+            }
+            else if (st.Length < ivLength)
+            {
+                st = st.PadRight(ivLength, ' ');
+            }
+
+            return GetBytes(st);
+        }
+
+        internal static Stream GetEncryptedStream(Stream encryptedStream)
+        {
+            ICryptoTransform encryptor;
+            encryptor = symAl.CreateEncryptor(GenLegalKey(), GenLegalIV());
+            return new CryptoStream(encryptedStream, encryptor, CryptoStreamMode.Write);
+        }
+
+        internal static Stream GetDecryptedStream(Stream encryptedStream)
+        {
+            ICryptoTransform decryptor;
+            decryptor = symAl.CreateDecryptor(GenLegalKey(), GenLegalIV());
+            return new CryptoStream(encryptedStream, decryptor, CryptoStreamMode.Read);
+        }
+
+        internal static uint Get24BitHash(string st)
+        {
+            if (string.IsNullOrEmpty(st))
+            {
+                return 0;
+            }
+
+            byte[] bytes = new byte[PACKAGE_SIZE];
+            for (int i = 0; i < PACKAGE_SIZE; i++)
+            {
+                if (i < st.Length)
+                {
+                    bytes[i] = (byte)st[i];
+                }
+            }
+
+            var hash = SHA512.Create();
+            byte[] hashValue = hash.ComputeHash(bytes);
+
+            for (int i = 0; i < 50000; i++)
+            {
+                hashValue = hash.ComputeHash(hashValue);
+            }
+
+            Logger.LogDebug(string.Format(CultureInfo.CurrentCulture, "magic: {0},{1},{2}", hashValue[0], hashValue[1], hashValue[^1]));
+            hash.Clear();
+            return (uint)((hashValue[0] << 23) + (hashValue[1] << 16) + (hashValue[^1] << 8) + hashValue[2]);
+        }
+
+        internal static string GetDebugInfo(string st)
+        {
+            return string.IsNullOrEmpty(st) ? st : ((byte)(Common.GetBytesU(st).Sum(value => value) % 256)).ToString(CultureInfo.InvariantCulture);
+        }
+
+        internal static string CreateDefaultKey()
+        {
+            return CreateRandomKey();
+        }
+
+        private const int PW_LENGTH = 16;
+
+        public static string CreateRandomKey()
+        {
+            // Not including characters like "'`O0& since they are confusing to users.
+            string[] chars = new[] { "abcdefghjkmnpqrstuvxyz", "ABCDEFGHJKMNPQRSTUVXYZ", "123456789", "~!@#$%^*()_-+=:;<,>.?/\\|[]" };
+            char[][] charactersUsedForKey = chars.Select(charset => Enumerable.Range(0, charset.Length - 1).Select(i => charset[i]).ToArray()).ToArray();
+            byte[] randomData = new byte[1];
+            string key = string.Empty;
+
+            do
+            {
+                foreach (string set in chars)
+                {
+                    randomData = RandomNumberGenerator.GetBytes(1);
+                    key += set[randomData[0] % set.Length];
+
+                    if (key.Length >= PW_LENGTH)
+                    {
+                        break;
+                    }
+                }
+            }
+            while (key.Length < PW_LENGTH);
+
+            return key;
+        }
+
+        internal static bool IsKeyValid(string key, out string error)
+        {
+            error = string.IsNullOrEmpty(key) || key.Length < 16
+                ? "Key must have at least 16 characters in length (spaces are discarded). Key must be auto generated in one of the machines."
+                : null;
+
+            return error == null;
+        }
+    }
+}

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

@@ -0,0 +1,262 @@
+// 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.
+
+// <summary>
+//     Package format/conversion.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+
+// In X64, we are WOW
+[module: SuppressMessage("Microsoft.Portability", "CA1900:ValueTypeFieldsShouldBePortable", Scope = "type", Target = "MouseWithoutBorders.DATA", Justification = "Dotnet port with style preservation")]
+
+namespace MouseWithoutBorders
+{
+    internal enum PackageType// : int
+    {
+        // Search for PACKAGE_TYPE_RELATED before changing these!
+        Invalid = 0xFF,
+
+        Error = 0xFE,
+
+        Hi = 2,
+        Hello = 3,
+        ByeBye = 4,
+
+        Heartbeat = 20,
+        Awake = 21,
+        HideMouse = 50,
+        Heartbeat_ex = 51,
+        Heartbeat_ex_l2 = 52,
+        Heartbeat_ex_l3 = 53,
+
+        Clipboard = 69,
+        ClipboardDragDrop = 70,
+        ClipboardDragDropEnd = 71,
+        ExplorerDragDrop = 72,
+        ClipboardCapture = 73,
+        CaptureScreenCommand = 74,
+        ClipboardDragDropOperation = 75,
+        ClipboardDataEnd = 76,
+        MachineSwitched = 77,
+        ClipboardAsk = 78,
+        ClipboardPush = 79,
+
+        NextMachine = 121,
+        Keyboard = 122,
+        Mouse = 123,
+        ClipboardText = 124,
+        ClipboardImage = 125,
+
+        Handshake = 126,
+        HandshakeAck = 127,
+
+        Matrix = 128,
+        MatrixSwapFlag = 2,
+        MatrixTwoRowFlag = 4,
+    }
+
+    internal struct PackageMonitor
+    {
+        internal ulong Keyboard;
+        internal ulong Mouse;
+        internal ulong Heartbeat;
+        internal ulong ByeBye;
+        internal ulong Hello;
+        internal ulong Matrix;
+        internal ulong ClipboardText;
+        internal ulong ClipboardImage;
+        internal ulong Clipboard;
+        internal ulong ClipboardDragDrop;
+        internal ulong ClipboardDragDropEnd;
+        internal ulong ClipboardAsk;
+        internal ulong ExplorerDragDrop;
+        internal ulong Nil;
+
+        internal PackageMonitor(ulong value)
+        {
+            ClipboardDragDrop = ClipboardDragDropEnd = ExplorerDragDrop =
+                Keyboard = Mouse = Heartbeat = ByeBye = Hello = Clipboard =
+                Matrix = ClipboardImage = ClipboardText = Nil = ClipboardAsk = value;
+        }
+    }
+
+    internal enum ID : uint
+    {
+        NONE = 0,
+        ALL = 255,
+    }
+
+    internal enum ClipboardPostAction : uint
+    {
+        Other = 0,
+        Desktop = 1,
+        Mspaint = 2,
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct KEYBDDATA
+    {
+        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
+        internal int wVk;
+        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
+        internal int dwFlags;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MOUSEDATA
+    {
+        internal int X;
+        internal int Y;
+        internal int WheelDelta;
+        [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
+        internal int dwFlags;
+    }
+
+    // The beauty of "union" in C#
+    [StructLayout(LayoutKind.Explicit)]
+    internal class DATA
+    {
+        [FieldOffset(0)]
+        internal PackageType Type; // 4 (first byte = package type, 1 = checksum, 2+3 = magic no.)
+
+        [FieldOffset(sizeof(PackageType))]
+        internal int Id; // 4
+
+        [FieldOffset(sizeof(PackageType) + sizeof(uint))]
+        internal ID Src; // 4
+
+        [FieldOffset(sizeof(PackageType) + (2 * sizeof(uint)))]
+        internal ID Des; // 4
+
+        [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
+        internal long DateTime;
+
+        [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)) + sizeof(long))]
+        internal KEYBDDATA Kd;
+
+        [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
+        internal MOUSEDATA Md;
+
+        [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
+        internal ID Machine1;
+
+        [FieldOffset(sizeof(PackageType) + (4 * sizeof(uint)))]
+        internal ID Machine2;
+
+        [FieldOffset(sizeof(PackageType) + (5 * sizeof(uint)))]
+        internal ID Machine3;
+
+        [FieldOffset(sizeof(PackageType) + (6 * sizeof(uint)))]
+        internal ID Machine4;
+
+        [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
+        internal ClipboardPostAction PostAction;
+
+        [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)))]
+        private long machineNameP1;
+
+        [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + sizeof(long))]
+        private long machineNameP2;
+
+        [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + (2 * sizeof(long)))]
+        private long machineNameP3;
+
+        [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + (3 * sizeof(long)))]
+        private long machineNameP4;
+
+        internal string MachineName
+        {
+            get
+            {
+                string name = Common.GetString(BitConverter.GetBytes(machineNameP1))
+                    + Common.GetString(BitConverter.GetBytes(machineNameP2))
+                    + Common.GetString(BitConverter.GetBytes(machineNameP3))
+                    + Common.GetString(BitConverter.GetBytes(machineNameP4));
+                return name.Trim();
+            }
+
+            set
+            {
+                byte[] machineName = Common.GetBytes(value.PadRight(32, ' '));
+                machineNameP1 = BitConverter.ToInt64(machineName, 0);
+                machineNameP2 = BitConverter.ToInt64(machineName, 8);
+                machineNameP3 = BitConverter.ToInt64(machineName, 16);
+                machineNameP4 = BitConverter.ToInt64(machineName, 24);
+            }
+        }
+
+        public DATA()
+        {
+        }
+
+        public DATA(byte[] initialData)
+        {
+            Bytes = initialData;
+        }
+
+        internal byte[] Bytes
+        {
+            get
+            {
+                byte[] buf = new byte[IsBigPackage ? Common.PACKAGE_SIZE_EX : Common.PACKAGE_SIZE];
+                Array.Copy(StructToBytes(this), buf, IsBigPackage ? Common.PACKAGE_SIZE_EX : Common.PACKAGE_SIZE);
+
+                return buf;
+            }
+
+            set
+            {
+                Debug.Assert(value.Length <= Common.PACKAGE_SIZE_EX, "Length > package size");
+                byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
+                Array.Copy(value, buf, value.Length);
+                BytesToStruct(buf, this);
+            }
+        }
+
+        internal bool IsBigPackage
+        {
+            get => Type == 0
+                    ? throw new InvalidOperationException("Package type not set.")
+                    : Type switch
+                    {
+                        PackageType.Hello or PackageType.Awake or PackageType.Heartbeat or PackageType.Heartbeat_ex or PackageType.Handshake or PackageType.HandshakeAck or PackageType.ClipboardPush or PackageType.Clipboard or PackageType.ClipboardAsk or PackageType.ClipboardImage or PackageType.ClipboardText or PackageType.ClipboardDataEnd => true,
+                        _ => (Type & PackageType.Matrix) == PackageType.Matrix,
+                    };
+        }
+
+        private byte[] StructToBytes(object structObject)
+        {
+            byte[] bytes = new byte[Common.PACKAGE_SIZE_EX];
+            GCHandle bHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+            Marshal.StructureToPtr(structObject, Marshal.UnsafeAddrOfPinnedArrayElement(bytes, 0), false);
+            bHandle.Free();
+            return bytes;
+        }
+
+        private void BytesToStruct(byte[] value, object structObject)
+        {
+            GCHandle bHandle = GCHandle.Alloc(value, GCHandleType.Pinned);
+            Marshal.PtrToStructure(Marshal.UnsafeAddrOfPinnedArrayElement(value, 0), structObject);
+            bHandle.Free();
+        }
+    }
+
+    internal partial class Common
+    {
+        internal const byte PACKAGE_SIZE = 32;
+        internal const byte PACKAGE_SIZE_EX = 64;
+        internal const byte WP_PACKAGE_SIZE = 6;
+        internal static PackageMonitor PackageSent;
+        internal static PackageMonitor PackageReceived;
+        internal static int PackageID;
+    }
+}

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

@@ -0,0 +1,33 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Telemetry;
+using MouseWithoutBorders.Class;
+
+using Logger = MouseWithoutBorders.Core.Logger;
+
+namespace MouseWithoutBorders
+{
+    internal class ShutdownWithPowerToys
+    {
+        public static void WaitForPowerToysRunner(ETWTrace etwTrace)
+        {
+            try
+            {
+                RunnerHelper.WaitForPowerToysRunnerExitFallback(() =>
+                    {
+                        etwTrace?.Dispose();
+                        Common.MainForm.Quit(true, false);
+                    });
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,131 @@
+// 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.
+
+// <summary>
+//     Virtual key constants.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using System;
+
+namespace MouseWithoutBorders
+{
+    internal enum VK : ushort
+    {
+        CAPITAL = 0x14,
+        NUMLOCK = 0x90,
+        SHIFT = 0x10,
+        CONTROL = 0x11,
+        MENU = 0x12,
+        ESCAPE = 0x1B,
+        BACK = 0x08,
+        TAB = 0x09,
+        RETURN = 0x0D,
+        PRIOR = 0x21,
+        NEXT = 0x22,
+        END = 0x23,
+        HOME = 0x24,
+        LEFT = 0x25,
+        UP = 0x26,
+        RIGHT = 0x27,
+        DOWN = 0x28,
+        SELECT = 0x29,
+        PRINT = 0x2A,
+        EXECUTE = 0x2B,
+        SNAPSHOT = 0x2C,
+        INSERT = 0x2D,
+        DELETE = 0x2E,
+        HELP = 0x2F,
+        NUMPAD0 = 0x60,
+        NUMPAD1 = 0x61,
+        NUMPAD2 = 0x62,
+        NUMPAD3 = 0x63,
+        NUMPAD4 = 0x64,
+        NUMPAD5 = 0x65,
+        NUMPAD6 = 0x66,
+        NUMPAD7 = 0x67,
+        NUMPAD8 = 0x68,
+        NUMPAD9 = 0x69,
+        MULTIPLY = 0x6A,
+        ADD = 0x6B,
+        SEPARATOR = 0x6C,
+        SUBTRACT = 0x6D,
+        DECIMAL = 0x6E,
+        DIVIDE = 0x6F,
+        F1 = 0x70,
+        F2 = 0x71,
+        F3 = 0x72,
+        F4 = 0x73,
+        F5 = 0x74,
+        F6 = 0x75,
+        F7 = 0x76,
+        F8 = 0x77,
+        F9 = 0x78,
+        F10 = 0x79,
+        F11 = 0x7A,
+        F12 = 0x7B,
+        OEM_1 = 0xBA,
+        OEM_PLUS = 0xBB,
+        OEM_COMMA = 0xBC,
+        OEM_MINUS = 0xBD,
+        OEM_PERIOD = 0xBE,
+        OEM_2 = 0xBF,
+        OEM_3 = 0xC0,
+        MEDIA_NEXT_TRACK = 0xB0,
+        MEDIA_PREV_TRACK = 0xB1,
+        MEDIA_STOP = 0xB2,
+        MEDIA_PLAY_PAUSE = 0xB3,
+        LWIN = 0x5B,
+        RWIN = 0x5C,
+        LSHIFT = 0xA0,
+        RSHIFT = 0xA1,
+        LCONTROL = 0xA2,
+        RCONTROL = 0xA3,
+        LMENU = 0xA4,
+        RMENU = 0xA5,
+    }
+
+    internal partial class Common
+    {
+        internal const ushort KEYEVENTF_KEYDOWN = 0x0001;
+        internal const ushort KEYEVENTF_KEYUP = 0x0002;
+
+        internal const int WH_MOUSE = 7;
+        internal const int WH_KEYBOARD = 2;
+        internal const int WH_MOUSE_LL = 14;
+        internal const int WH_KEYBOARD_LL = 13;
+
+        internal const int WM_MOUSEMOVE = 0x200;
+        internal const int WM_LBUTTONDOWN = 0x201;
+        internal const int WM_RBUTTONDOWN = 0x204;
+        internal const int WM_MBUTTONDOWN = 0x207;
+        internal const int WM_XBUTTONDOWN = 0x20B;
+        internal const int WM_LBUTTONUP = 0x202;
+        internal const int WM_RBUTTONUP = 0x205;
+        internal const int WM_MBUTTONUP = 0x208;
+        internal const int WM_XBUTTONUP = 0x20C;
+        internal const int WM_LBUTTONDBLCLK = 0x203;
+        internal const int WM_RBUTTONDBLCLK = 0x206;
+        internal const int WM_MBUTTONDBLCLK = 0x209;
+        internal const int WM_MOUSEWHEEL = 0x020A;
+        internal const int WM_MOUSEHWHEEL = 0x020E;
+
+        internal const int WM_KEYDOWN = 0x100;
+        internal const int WM_KEYUP = 0x101;
+        internal const int WM_SYSKEYDOWN = 0x104;
+        internal const int WM_SYSKEYUP = 0x105;
+
+        [Flags]
+        internal enum LLKHF
+        {
+            EXTENDED = 0x01,
+            INJECTED = 0x10,
+            ALTDOWN = 0x20,
+            UP = 0x80,
+        }
+    }
+}

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

@@ -0,0 +1,363 @@
+// 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.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Windows.Forms;
+
+// <summary>
+//     Screen/Desktop helper functions.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Core;
+
+using Thread = MouseWithoutBorders.Core.Thread;
+
+namespace MouseWithoutBorders
+{
+    // Desktops, and GetScreenConfig routines
+    internal partial class Common
+    {
+        private static MyRectangle newDesktopBounds;
+        private static MyRectangle newPrimaryScreenBounds;
+        private static string activeDesktop;
+
+        internal static string ActiveDesktop => Common.activeDesktop;
+
+        internal static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
+        {
+            GetScreenConfig();
+        }
+
+        internal static readonly List<Point> SensitivePoints = new();
+
+        private static bool MonitorEnumProc(IntPtr hMonitor, IntPtr hdcMonitor, ref NativeMethods.RECT lprcMonitor, IntPtr dwData)
+        {
+            // lprcMonitor is wrong!!! => using GetMonitorInfo(...)
+            // Log(String.Format( CultureInfo.CurrentCulture,"MONITOR: l{0}, t{1}, r{2}, b{3}", lprcMonitor.Left, lprcMonitor.Top, lprcMonitor.Right, lprcMonitor.Bottom));
+            NativeMethods.MonitorInfoEx mi = default;
+            mi.cbSize = Marshal.SizeOf(mi);
+            _ = NativeMethods.GetMonitorInfo(hMonitor, ref mi);
+
+            try
+            {
+                // For logging only
+                _ = NativeMethods.GetDpiForMonitor(hMonitor, 0, out uint dpiX, out uint dpiY);
+                Logger.Log(string.Format(CultureInfo.CurrentCulture, "MONITOR: ({0}, {1}, {2}, {3}). DPI: ({4}, {5})", mi.rcMonitor.Left, mi.rcMonitor.Top, mi.rcMonitor.Right, mi.rcMonitor.Bottom, dpiX, dpiY));
+            }
+            catch (DllNotFoundException)
+            {
+                Logger.Log("GetDpiForMonitor is unsupported in Windows 7 and lower.");
+            }
+            catch (EntryPointNotFoundException)
+            {
+                Logger.Log("GetDpiForMonitor is unsupported in Windows 7 and lower.");
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+
+            if (mi.rcMonitor.Left == 0 && mi.rcMonitor.Top == 0 && mi.rcMonitor.Right != 0 && mi.rcMonitor.Bottom != 0)
+            {
+                // Primary screen
+                _ = Interlocked.Exchange(ref screenWidth, mi.rcMonitor.Right - mi.rcMonitor.Left);
+                _ = Interlocked.Exchange(ref screenHeight, mi.rcMonitor.Bottom - mi.rcMonitor.Top);
+
+                newPrimaryScreenBounds.Left = mi.rcMonitor.Left;
+                newPrimaryScreenBounds.Top = mi.rcMonitor.Top;
+                newPrimaryScreenBounds.Right = mi.rcMonitor.Right;
+                newPrimaryScreenBounds.Bottom = mi.rcMonitor.Bottom;
+            }
+            else
+            {
+                if (mi.rcMonitor.Left < newDesktopBounds.Left)
+                {
+                    newDesktopBounds.Left = mi.rcMonitor.Left;
+                }
+
+                if (mi.rcMonitor.Top < newDesktopBounds.Top)
+                {
+                    newDesktopBounds.Top = mi.rcMonitor.Top;
+                }
+
+                if (mi.rcMonitor.Right > newDesktopBounds.Right)
+                {
+                    newDesktopBounds.Right = mi.rcMonitor.Right;
+                }
+
+                if (mi.rcMonitor.Bottom > newDesktopBounds.Bottom)
+                {
+                    newDesktopBounds.Bottom = mi.rcMonitor.Bottom;
+                }
+            }
+
+            lock (SensitivePoints)
+            {
+                SensitivePoints.Add(new Point(mi.rcMonitor.Left, mi.rcMonitor.Top));
+                SensitivePoints.Add(new Point(mi.rcMonitor.Right, mi.rcMonitor.Top));
+                SensitivePoints.Add(new Point(mi.rcMonitor.Right, mi.rcMonitor.Bottom));
+                SensitivePoints.Add(new Point(mi.rcMonitor.Left, mi.rcMonitor.Bottom));
+            }
+
+            return true;
+        }
+
+        internal static void GetScreenConfig()
+        {
+            try
+            {
+                Logger.LogDebug("==================== GetScreenConfig started");
+                newDesktopBounds = new MyRectangle();
+                newPrimaryScreenBounds = new MyRectangle();
+                newDesktopBounds.Left = newPrimaryScreenBounds.Left = Screen.PrimaryScreen.Bounds.Left;
+                newDesktopBounds.Top = newPrimaryScreenBounds.Top = Screen.PrimaryScreen.Bounds.Top;
+                newDesktopBounds.Right = newPrimaryScreenBounds.Right = Screen.PrimaryScreen.Bounds.Right;
+                newDesktopBounds.Bottom = newPrimaryScreenBounds.Bottom = Screen.PrimaryScreen.Bounds.Bottom;
+
+                Logger.Log(string.Format(
+                    CultureInfo.CurrentCulture,
+                    "logon = {0} PrimaryScreenBounds = {1},{2},{3},{4} desktopBounds = {5},{6},{7},{8}",
+                    Common.RunOnLogonDesktop,
+                    Common.newPrimaryScreenBounds.Left,
+                    Common.newPrimaryScreenBounds.Top,
+                    Common.newPrimaryScreenBounds.Right,
+                    Common.newPrimaryScreenBounds.Bottom,
+                    Common.newDesktopBounds.Left,
+                    Common.newDesktopBounds.Top,
+                    Common.newDesktopBounds.Right,
+                    Common.newDesktopBounds.Bottom));
+
+#if USE_MANAGED_ROUTINES
+                // Managed routines do not work well when running on secure desktop:(
+                screenWidth = Screen.PrimaryScreen.Bounds.Width;
+                screenHeight = Screen.PrimaryScreen.Bounds.Height;
+                screenCount = Screen.AllScreens.Length;
+                for (int i = 0; i < Screen.AllScreens.Length; i++)
+                {
+                    if (Screen.AllScreens[i].Bounds.Left < desktopBounds.Left) desktopBounds.Left = Screen.AllScreens[i].Bounds.Left;
+                    if (Screen.AllScreens[i].Bounds.Top < desktopBounds.Top) desktopBounds.Top = Screen.AllScreens[i].Bounds.Top;
+                    if (Screen.AllScreens[i].Bounds.Right > desktopBounds.Right) desktopBounds.Right = Screen.AllScreens[i].Bounds.Right;
+                    if (Screen.AllScreens[i].Bounds.Bottom > desktopBounds.Bottom) desktopBounds.Bottom = Screen.AllScreens[i].Bounds.Bottom;
+                }
+#else
+                lock (SensitivePoints)
+                {
+                    SensitivePoints.Clear();
+                }
+
+                NativeMethods.EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero, MonitorEnumProc, IntPtr.Zero);
+
+                // 1000 calls to EnumDisplayMonitors cost a dozen of milliseconds
+#endif
+                Interlocked.Exchange(ref MachineStuff.desktopBounds, newDesktopBounds);
+                Interlocked.Exchange(ref MachineStuff.primaryScreenBounds, newPrimaryScreenBounds);
+
+                Logger.Log(string.Format(
+                    CultureInfo.CurrentCulture,
+                    "logon = {0} PrimaryScreenBounds = {1},{2},{3},{4} desktopBounds = {5},{6},{7},{8}",
+                    Common.RunOnLogonDesktop,
+                    MachineStuff.PrimaryScreenBounds.Left,
+                    MachineStuff.PrimaryScreenBounds.Top,
+                    MachineStuff.PrimaryScreenBounds.Right,
+                    MachineStuff.PrimaryScreenBounds.Bottom,
+                    MachineStuff.DesktopBounds.Left,
+                    MachineStuff.DesktopBounds.Top,
+                    MachineStuff.DesktopBounds.Right,
+                    MachineStuff.DesktopBounds.Bottom));
+
+                Logger.Log("==================== GetScreenConfig ended");
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+#if USING_SCREEN_SAVER_ROUTINES
+                [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern int PostMessage(IntPtr hWnd, int wMsg, int wParam, int lParam);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern IntPtr OpenDesktop(string hDesktop, int Flags, bool Inherit, UInt32 DesiredAccess);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern bool CloseDesktop(IntPtr hDesktop);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern bool EnumDesktopWindows( IntPtr hDesktop, EnumDesktopWindowsProc callback, IntPtr lParam);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern bool IsWindowVisible(IntPtr hWnd);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto)]
+        private static extern bool SystemParametersInfo(int uAction, int uParam, ref int pvParam, int flags);
+
+        private delegate bool EnumDesktopWindowsProc(IntPtr hDesktop, IntPtr lParam);
+        private const int WM_CLOSE = 16;
+        private const int SPI_GETSCREENSAVERRUNNING = 114;
+
+        internal static bool IsScreenSaverRunning()
+        {
+            int isRunning = 0;
+            SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0,ref isRunning, 0);
+            return (isRunning != 0);
+        }
+
+        internal static void CloseScreenSaver()
+        {
+            IntPtr hDesktop = OpenDesktop("Screen-saver", 0, false, DESKTOP_READOBJECTS | DESKTOP_WRITEOBJECTS);
+            if (hDesktop != IntPtr.Zero)
+            {
+                LogDebug("Closing screen saver...");
+                EnumDesktopWindows(hDesktop, new EnumDesktopWindowsProc(CloseScreenSaverFunc), IntPtr.Zero);
+                CloseDesktop(hDesktop);
+            }
+        }
+
+        private static bool CloseScreenSaverFunc(IntPtr hWnd, IntPtr lParam)
+        {
+            if (IsWindowVisible(hWnd))
+            {
+                LogDebug("Posting WM_CLOSE to " + hWnd.ToString(CultureInfo.InvariantCulture));
+                PostMessage(hWnd, WM_CLOSE, 0, 0);
+            }
+            return true;
+        }
+#endif
+
+        internal static string GetMyDesktop()
+        {
+            byte[] arThreadDesktop = new byte[256];
+            IntPtr hD = NativeMethods.GetThreadDesktop(NativeMethods.GetCurrentThreadId());
+            if (hD != IntPtr.Zero)
+            {
+                _ = NativeMethods.GetUserObjectInformation(hD, NativeMethods.UOI_NAME, arThreadDesktop, arThreadDesktop.Length, out _);
+                return GetString(arThreadDesktop).Replace("\0", string.Empty);
+            }
+
+            return string.Empty;
+        }
+
+        internal static string GetInputDesktop()
+        {
+            byte[] arInputDesktop = new byte[256];
+            IntPtr hD = NativeMethods.OpenInputDesktop(0, false, NativeMethods.DESKTOP_READOBJECTS);
+            if (hD != IntPtr.Zero)
+            {
+                _ = NativeMethods.GetUserObjectInformation(hD, NativeMethods.UOI_NAME, arInputDesktop, arInputDesktop.Length, out _);
+                return GetString(arInputDesktop).Replace("\0", string.Empty);
+            }
+
+            return string.Empty;
+        }
+
+        internal static void StartMMService(string desktopToRunMouseWithoutBordersOn)
+        {
+            if (!Common.RunWithNoAdminRight)
+            {
+                Logger.LogDebug("*** Starting on active Desktop: " + desktopToRunMouseWithoutBordersOn);
+                Service.StartMouseWithoutBordersService(desktopToRunMouseWithoutBordersOn);
+            }
+        }
+
+        internal static void CheckForDesktopSwitchEvent(bool cleanupIfExit)
+        {
+            try
+            {
+                if (!IsMyDesktopActive() || Common.CurrentProcess.SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
+                {
+                    Helper.RunDDHelper(true);
+                    int waitCount = 20;
+
+                    while (NativeMethods.WTSGetActiveConsoleSessionId() == 0xFFFFFFFF && waitCount > 0)
+                    {
+                        waitCount--;
+                        Logger.LogDebug("The session is detached/attached.");
+                        Thread.Sleep(500);
+                    }
+
+                    string myDesktop = GetMyDesktop();
+                    activeDesktop = GetInputDesktop();
+
+                    Logger.LogDebug("*** Active Desktop = " + activeDesktop);
+                    Logger.LogDebug("*** My Desktop = " + myDesktop);
+
+                    if (myDesktop.Equals(activeDesktop, StringComparison.OrdinalIgnoreCase))
+                    {
+                        Logger.LogDebug("*** Active Desktop == My Desktop (TS session)");
+                    }
+
+                    if (!activeDesktop.Equals("winlogon", StringComparison.OrdinalIgnoreCase) &&
+                        !activeDesktop.Equals("default", StringComparison.OrdinalIgnoreCase) &&
+                        !activeDesktop.Equals("disconnect", StringComparison.OrdinalIgnoreCase))
+                    {
+                        try
+                        {
+                            StartMMService(activeDesktop);
+                        }
+                        catch (Exception e)
+                        {
+                            Logger.Log($"{nameof(CheckForDesktopSwitchEvent)}: {e}");
+                        }
+                    }
+                    else
+                    {
+                        if (!myDesktop.Equals(activeDesktop, StringComparison.OrdinalIgnoreCase))
+                        {
+                            Logger.Log("*** Active Desktop <> My Desktop");
+                        }
+
+                        uint sid = NativeMethods.WTSGetActiveConsoleSessionId();
+
+                        if (Process.GetProcessesByName(Common.BinaryName).Any(p => (uint)p.SessionId == sid))
+                        {
+                            Logger.Log("Found MouseWithoutBorders on the active session!");
+                        }
+                        else
+                        {
+                            Logger.Log("MouseWithoutBorders not found on the active session!");
+                            StartMMService(null);
+                        }
+                    }
+
+                    if (!myDesktop.Equals("winlogon", StringComparison.OrdinalIgnoreCase) &&
+                        !myDesktop.Equals("default", StringComparison.OrdinalIgnoreCase))
+                    {
+                        Logger.LogDebug("*** Desktop inactive, exiting: " + myDesktop);
+                        Setting.Values.LastX = JUST_GOT_BACK_FROM_SCREEN_SAVER;
+                        if (cleanupIfExit)
+                        {
+                            InitAndCleanup.Cleanup();
+                        }
+
+                        Process.GetCurrentProcess().KillProcess();
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                Logger.Log(e);
+            }
+        }
+
+        private static Point p;
+
+        internal static bool IsMyDesktopActive()
+        {
+            return NativeMethods.GetCursorPos(ref p);
+        }
+    }
+}

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

@@ -315,7 +315,7 @@ namespace MouseWithoutBorders
                 if (!acquireMutex)
                 {
                     Process[] ps = Process.GetProcessesByName(Common.BinaryName);
-                    Logger.TelemetryLogTrace($"Balance: {socketMutexBalance}, Active: {WinAPI.IsMyDesktopActive()}, Sid/Console: {Process.GetCurrentProcess().SessionId}/{NativeMethods.WTSGetActiveConsoleSessionId()}, Desktop/Input: {WinAPI.GetMyDesktop()}/{WinAPI.GetInputDesktop()}, count: {ps?.Length}.", SeverityLevel.Warning);
+                    Logger.TelemetryLogTrace($"Balance: {socketMutexBalance}, Active: {IsMyDesktopActive()}, Sid/Console: {Process.GetCurrentProcess().SessionId}/{NativeMethods.WTSGetActiveConsoleSessionId()}, Desktop/Input: {GetMyDesktop()}/{GetInputDesktop()}, count: {ps?.Length}.", SeverityLevel.Warning);
                 }
 
                 Logger.LogDebug("SOCKET MUTEX ENDED.");
@@ -358,7 +358,7 @@ namespace MouseWithoutBorders
 
                     Logger.TelemetryLogTrace($"[{actionName}] took more than {(long)timeout.TotalSeconds}, restarting the process.", SeverityLevel.Warning, true);
 
-                    string desktop = WinAPI.GetMyDesktop();
+                    string desktop = Common.GetMyDesktop();
                     MachineStuff.oneInstanceCheck?.Close();
                     _ = Process.Start(Application.ExecutablePath, desktop);
                     Logger.LogDebug($"Started on desktop {desktop}");
@@ -514,7 +514,7 @@ namespace MouseWithoutBorders
 
         internal static void SendHeartBeat(bool initial = false)
         {
-            SendPackage(ID.ALL, initial && Encryption.GeneratedKey ? PackageType.Heartbeat_ex : PackageType.Heartbeat);
+            SendPackage(ID.ALL, initial && Common.GeneratedKey ? PackageType.Heartbeat_ex : PackageType.Heartbeat);
         }
 
         private static long lastSendNextMachine;
@@ -550,7 +550,7 @@ namespace MouseWithoutBorders
 
         internal static void SendAwakeBeat()
         {
-            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && WinAPI.IsMyDesktopActive() &&
+            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive() &&
                 Setting.Values.BlockScreenSaver && lastRealInputEventCount != Event.RealInputEventCount)
             {
                 SendPackage(ID.ALL, PackageType.Awake);
@@ -568,7 +568,7 @@ namespace MouseWithoutBorders
         {
             if (lastInputEventCount == Event.InputEventCount)
             {
-                if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && WinAPI.IsMyDesktopActive())
+                if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive())
                 {
                     PokeMyself();
                 }
@@ -577,13 +577,13 @@ namespace MouseWithoutBorders
             lastInputEventCount = Event.InputEventCount;
         }
 
-        internal static void PokeMyself()
+        private static void PokeMyself()
         {
             int x, y = 0;
 
             for (int i = 0; i < 10; i++)
             {
-                x = Encryption.Ran.Next(-9, 10);
+                x = Ran.Next(-9, 10);
                 InputSimulation.MoveMouseRelative(x, y);
                 Thread.Sleep(50);
                 InputSimulation.MoveMouseRelative(-x, -y);
@@ -677,7 +677,7 @@ namespace MouseWithoutBorders
                 {
                     Common.MMSleep(0.2);
                     InputSimulation.SendKey(new KEYBDDATA() { wVk = (int)VK.SNAPSHOT });
-                    InputSimulation.SendKey(new KEYBDDATA() { dwFlags = (int)WM.LLKHF.UP, wVk = (int)VK.SNAPSHOT });
+                    InputSimulation.SendKey(new KEYBDDATA() { dwFlags = (int)Common.LLKHF.UP, wVk = (int)VK.SNAPSHOT });
 
                     Logger.LogDebug("PrepareScreenCapture: SNAPSHOT simulated.");
 
@@ -710,7 +710,7 @@ namespace MouseWithoutBorders
                 "\"" + Environment.ExpandEnvironmentVariables(@"%SystemRoot%\System32\Mspaint.exe") +
                 "\"",
                 "\"" + file + "\"",
-                WinAPI.GetInputDesktop(),
+                GetInputDesktop(),
                 1);
 
             // CreateNormalIntegrityProcess(Environment.ExpandEnvironmentVariables(@"%SystemRoot%\System32\Mspaint.exe") +
@@ -919,7 +919,7 @@ namespace MouseWithoutBorders
 
                 try
                 {
-                    data.Id = Interlocked.Increment(ref Package.PackageID);
+                    data.Id = Interlocked.Increment(ref PackageID);
 
                     bool updateClientSockets = false;
 
@@ -999,7 +999,7 @@ namespace MouseWithoutBorders
             }
             else
             {
-                Package.PackageSent.Nil++;
+                PackageSent.Nil++;
             }
         }
 
@@ -1379,7 +1379,7 @@ namespace MouseWithoutBorders
 
                 if (string.IsNullOrEmpty(machine_Name))
                 {
-                    machine_Name = "RANDOM" + Encryption.Ran.Next().ToString(CultureInfo.CurrentCulture);
+                    machine_Name = "RANDOM" + Ran.Next().ToString(CultureInfo.CurrentCulture);
                 }
             }
 
@@ -1533,13 +1533,13 @@ namespace MouseWithoutBorders
 
         internal static void SendOrReceiveARandomDataBlockPerInitialIV(Stream st, bool send = true)
         {
-            byte[] ranData = new byte[Encryption.SymAlBlockSize];
+            byte[] ranData = new byte[SymAlBlockSize];
 
             try
             {
                 if (send)
                 {
-                    ranData = RandomNumberGenerator.GetBytes(Encryption.SymAlBlockSize);
+                    ranData = RandomNumberGenerator.GetBytes(SymAlBlockSize);
                     st.Write(ranData, 0, ranData.Length);
                 }
                 else

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

@@ -109,7 +109,7 @@ namespace MouseWithoutBorders.Class
             // Install Mouse Hook
             mouseHookProcedure = new NativeMethods.HookProc(MouseHookProc);
             hMouseHook = NativeMethods.SetWindowsHookEx(
-                WM.WH_MOUSE_LL,
+                Common.WH_MOUSE_LL,
                 mouseHookProcedure,
                 Marshal.GetHINSTANCE(
                     Assembly.GetExecutingAssembly().GetModules()[0]),
@@ -126,7 +126,7 @@ namespace MouseWithoutBorders.Class
             // Install Keyboard Hook
             keyboardHookProcedure = new NativeMethods.HookProc(KeyboardHookProc);
             hKeyboardHook = NativeMethods.SetWindowsHookEx(
-                WM.WH_KEYBOARD_LL,
+                Common.WH_KEYBOARD_LL,
                 keyboardHookProcedure,
                 Marshal.GetHINSTANCE(
                 Assembly.GetExecutingAssembly().GetModules()[0]),
@@ -233,7 +233,7 @@ namespace MouseWithoutBorders.Class
 
                     if (nCode >= 0 && MouseEvent != null)
                     {
-                        if (wParam == WM.WM_LBUTTONUP && SkipMouseUpCount > 0)
+                        if (wParam == Common.WM_LBUTTONUP && SkipMouseUpCount > 0)
                         {
                             Logger.LogDebug($"{nameof(SkipMouseUpCount)}: {SkipMouseUpCount}.");
                             SkipMouseUpCount--;
@@ -241,7 +241,7 @@ namespace MouseWithoutBorders.Class
                             return rv;
                         }
 
-                        if ((wParam == WM.WM_LBUTTONUP || wParam == WM.WM_LBUTTONDOWN) && SkipMouseUpDown)
+                        if ((wParam == Common.WM_LBUTTONUP || wParam == Common.WM_LBUTTONDOWN) && SkipMouseUpDown)
                         {
                             rv = NativeMethods.CallNextHookEx(hMouseHook, nCode, wParam, lParam);
                             return rv;
@@ -370,7 +370,7 @@ namespace MouseWithoutBorders.Class
 
         private bool ProcessKeyEx(int vkCode, int flags, KEYBDDATA hookCallbackKeybdData)
         {
-            if ((flags & (int)WM.LLKHF.UP) == (int)WM.LLKHF.UP)
+            if ((flags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
             {
                 EasyMouseKeyDown = false;
 
@@ -553,7 +553,7 @@ namespace MouseWithoutBorders.Class
                             KeyboardEvent(hookCallbackKeybdData);
                         }
 
-                        hookCallbackKeybdData.dwFlags |= (int)WM.LLKHF.UP;
+                        hookCallbackKeybdData.dwFlags |= (int)Common.LLKHF.UP;
 
                         foreach (var code in codes)
                         {

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

@@ -112,12 +112,12 @@ namespace MouseWithoutBorders.Class
             uint scanCode = 0;
 
             // http://msdn.microsoft.com/en-us/library/ms644967(VS.85).aspx
-            if ((kd.dwFlags & (int)WM.LLKHF.UP) == (int)WM.LLKHF.UP)
+            if ((kd.dwFlags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
             {
                 dwFlags = NativeMethods.KEYEVENTF.KEYUP;
             }
 
-            if ((kd.dwFlags & (int)WM.LLKHF.EXTENDED) == (int)WM.LLKHF.EXTENDED)
+            if ((kd.dwFlags & (int)Common.LLKHF.EXTENDED) == (int)Common.LLKHF.EXTENDED)
             {
                 dwFlags |= NativeMethods.KEYEVENTF.EXTENDEDKEY;
             }
@@ -173,44 +173,44 @@ namespace MouseWithoutBorders.Class
             mouse_input.mi.dy = (int)dy;
             mouse_input.mi.mouseData = md.WheelDelta;
 
-            if (md.dwFlags != WM.WM_MOUSEMOVE)
+            if (md.dwFlags != Common.WM_MOUSEMOVE)
             {
                 Logger.LogDebug($"InputSimulation.SendMouse: x = {md.X}, y = {md.Y}, WheelDelta = {md.WheelDelta}, dwFlags = {md.dwFlags}.");
             }
 
             switch (md.dwFlags)
             {
-                case WM.WM_MOUSEMOVE:
+                case Common.WM_MOUSEMOVE:
                     mouse_input.mi.dwFlags |= (int)(NativeMethods.MOUSEEVENTF.MOVE | NativeMethods.MOUSEEVENTF.ABSOLUTE);
                     break;
-                case WM.WM_LBUTTONDOWN:
+                case Common.WM_LBUTTONDOWN:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.LEFTDOWN;
                     break;
-                case WM.WM_LBUTTONUP:
+                case Common.WM_LBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.LEFTUP;
                     break;
-                case WM.WM_RBUTTONDOWN:
+                case Common.WM_RBUTTONDOWN:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.RIGHTDOWN;
                     break;
-                case WM.WM_RBUTTONUP:
+                case Common.WM_RBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.RIGHTUP;
                     break;
-                case WM.WM_MBUTTONDOWN:
+                case Common.WM_MBUTTONDOWN:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.MIDDLEDOWN;
                     break;
-                case WM.WM_MBUTTONUP:
+                case Common.WM_MBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.MIDDLEUP;
                     break;
-                case WM.WM_MOUSEWHEEL:
+                case Common.WM_MOUSEWHEEL:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.WHEEL;
                     break;
-                case WM.WM_MOUSEHWHEEL:
+                case Common.WM_MOUSEHWHEEL:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.HWHEEL;
                     break;
-                case WM.WM_XBUTTONUP:
+                case Common.WM_XBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.XUP;
                     break;
-                case WM.WM_XBUTTONDOWN:
+                case Common.WM_XBUTTONDOWN:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.XDOWN;
                     break;
 
@@ -373,7 +373,7 @@ namespace MouseWithoutBorders.Class
         {
             eatKey = false;
 
-            if ((flags & (int)WM.LLKHF.UP) == (int)WM.LLKHF.UP)
+            if ((flags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
             {
                 switch ((VK)vkCode)
                 {

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

@@ -143,7 +143,7 @@ namespace MouseWithoutBorders.Class
                         return;
                     }
 
-                    string myDesktop = WinAPI.GetMyDesktop();
+                    string myDesktop = Common.GetMyDesktop();
 
                     if (firstArg.Equals("winlogon", StringComparison.OrdinalIgnoreCase))
                     {
@@ -305,8 +305,8 @@ namespace MouseWithoutBorders.Class
 
                 MachineStuff.ClearComputerMatrix();
                 Setting.Values.MyKey = securityKey;
-                Encryption.MyKey = securityKey;
-                Encryption.MagicNumber = Encryption.Get24BitHash(Encryption.MyKey);
+                Common.MyKey = securityKey;
+                Common.MagicNumber = Common.Get24BitHash(Common.MyKey);
                 MachineStuff.MachineMatrix = new string[MachineStuff.MAX_MACHINE] { pcName.Trim().ToUpper(CultureInfo.CurrentCulture), Common.MachineName.Trim(), string.Empty, string.Empty };
 
                 string[] machines = MachineStuff.MachineMatrix;
@@ -328,8 +328,8 @@ namespace MouseWithoutBorders.Class
 
                 Setting.Values.EasyMouse = (int)EasyMouseOption.Enable;
                 MachineStuff.ClearComputerMatrix();
-                Setting.Values.MyKey = Encryption.MyKey = Encryption.CreateRandomKey();
-                Encryption.GeneratedKey = true;
+                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+                Common.GeneratedKey = true;
 
                 Setting.Values.PauseInstantSaving = false;
                 Setting.Values.SaveSettings();

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

@@ -109,9 +109,9 @@ namespace MouseWithoutBorders.Class
 
                         var shouldReopenSockets = false;
 
-                        if (Encryption.MyKey != _properties.SecurityKey.Value)
+                        if (Common.MyKey != _properties.SecurityKey.Value)
                         {
-                            Encryption.MyKey = _properties.SecurityKey.Value;
+                            Common.MyKey = _properties.SecurityKey.Value;
                             shouldReopenSockets = true;
                         }
 
@@ -489,7 +489,7 @@ namespace MouseWithoutBorders.Class
                     }
                     else
                     {
-                        string randomKey = Encryption.CreateDefaultKey();
+                        string randomKey = Common.CreateDefaultKey();
                         _properties.SecurityKey.Value = randomKey;
 
                         return randomKey;
@@ -1055,7 +1055,7 @@ namespace MouseWithoutBorders.Class
 
                     if (machineId == 0)
                     {
-                        var newMachineId = Encryption.Ran.Next();
+                        var newMachineId = Common.Ran.Next();
                         _properties.MachineID.Value = newMachineId;
                         machineId = newMachineId;
                         if (!PauseInstantSaving)

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

@@ -101,7 +101,7 @@ namespace MouseWithoutBorders.Class
             {
                 if (encryptedStream == null && BackingSocket.Connected)
                 {
-                    encryptedStream = Encryption.GetEncryptedStream(new NetworkStream(BackingSocket));
+                    encryptedStream = Common.GetEncryptedStream(new NetworkStream(BackingSocket));
                     Common.SendOrReceiveARandomDataBlockPerInitialIV(encryptedStream);
                 }
 
@@ -115,7 +115,7 @@ namespace MouseWithoutBorders.Class
             {
                 if (decryptedStream == null && BackingSocket.Connected)
                 {
-                    decryptedStream = Encryption.GetDecryptedStream(new NetworkStream(BackingSocket));
+                    decryptedStream = Common.GetDecryptedStream(new NetworkStream(BackingSocket));
                     Common.SendOrReceiveARandomDataBlockPerInitialIV(decryptedStream, false);
                 }
 
@@ -181,7 +181,7 @@ namespace MouseWithoutBorders.Class
             Logger.LogDebug("SocketStuff started.");
 
             bASE_PORT = port;
-            Encryption.Ran = new Random();
+            Common.Ran = new Random();
 
             Logger.LogDebug("Validating session...");
 
@@ -221,11 +221,11 @@ namespace MouseWithoutBorders.Class
 
                 if (Setting.Values.IsMyKeyRandom)
                 {
-                    Setting.Values.MyKey = Encryption.MyKey;
+                    Setting.Values.MyKey = Common.MyKey;
                 }
 
-                Encryption.MagicNumber = Encryption.Get24BitHash(Encryption.MyKey);
-                Package.PackageID = Setting.Values.PackageID;
+                Common.MagicNumber = Common.Get24BitHash(Common.MyKey);
+                Common.PackageID = Setting.Values.PackageID;
 
                 TcpPort = bASE_PORT;
 
@@ -242,7 +242,7 @@ namespace MouseWithoutBorders.Class
                 Logger.TelemetryLogTrace($"{nameof(SocketStuff)}: {e.Message}", SeverityLevel.Warning);
             }
 
-            WinAPI.GetScreenConfig();
+            Common.GetScreenConfig();
 
             if (firstRun && Common.RunOnScrSaverDesktop)
             {
@@ -305,7 +305,7 @@ namespace MouseWithoutBorders.Class
                             sleepSecs = 10;
 
                             // It is reasonable to give a try on restarting MwB processes in other sessions.
-                            if (restartCount++ < 5 && WinAPI.IsMyDesktopActive() && !Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
+                            if (restartCount++ < 5 && Common.IsMyDesktopActive() && !Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                             {
                                 Logger.TelemetryLogTrace("Restarting the service dues to WSAEADDRINUSE.", SeverityLevel.Warning);
                                 Program.StartService();
@@ -361,7 +361,7 @@ namespace MouseWithoutBorders.Class
                 {
                     Setting.Values.LastX = Common.LastX;
                     Setting.Values.LastY = Common.LastY;
-                    Setting.Values.PackageID = Package.PackageID;
+                    Setting.Values.PackageID = Common.PackageID;
 
                     // Common.Log("Saving IP: " + Setting.Values.DesMachineID.ToString(CultureInfo.CurrentCulture));
                     Setting.Values.DesMachineID = (uint)Common.DesMachineID;
@@ -505,10 +505,10 @@ namespace MouseWithoutBorders.Class
                 throw new ExpectedSocketException(log);
             }
 
-            bytes[3] = (byte)((Encryption.MagicNumber >> 24) & 0xFF);
-            bytes[2] = (byte)((Encryption.MagicNumber >> 16) & 0xFF);
+            bytes[3] = (byte)((Common.MagicNumber >> 24) & 0xFF);
+            bytes[2] = (byte)((Common.MagicNumber >> 16) & 0xFF);
             bytes[1] = 0;
-            for (int i = 2; i < Package.PACKAGE_SIZE; i++)
+            for (int i = 2; i < Common.PACKAGE_SIZE; i++)
             {
                 bytes[1] = (byte)(bytes[1] + bytes[i]);
             }
@@ -535,13 +535,13 @@ namespace MouseWithoutBorders.Class
 
             magic = (buf[3] << 24) + (buf[2] << 16);
 
-            if (magic != (Encryption.MagicNumber & 0xFFFF0000))
+            if (magic != (Common.MagicNumber & 0xFFFF0000))
             {
                 Logger.Log("Magic number invalid!");
                 buf[0] = (byte)PackageType.Invalid;
             }
 
-            for (int i = 2; i < Package.PACKAGE_SIZE; i++)
+            for (int i = 2; i < Common.PACKAGE_SIZE; i++)
             {
                 checksum = (byte)(checksum + buf[i]);
             }
@@ -557,7 +557,7 @@ namespace MouseWithoutBorders.Class
 
         internal static DATA TcpReceiveData(TcpSk tcp, out int bytesReceived)
         {
-            byte[] buf = new byte[Package.PACKAGE_SIZE_EX];
+            byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
             Stream decryptedStream = tcp.DecryptedStream;
 
             if (tcp.BackingSocket == null || !tcp.BackingSocket.Connected || decryptedStream == null)
@@ -571,9 +571,9 @@ namespace MouseWithoutBorders.Class
 
             try
             {
-                bytesReceived = decryptedStream.ReadEx(buf, 0, Package.PACKAGE_SIZE);
+                bytesReceived = decryptedStream.ReadEx(buf, 0, Common.PACKAGE_SIZE);
 
-                if (bytesReceived != Package.PACKAGE_SIZE)
+                if (bytesReceived != Common.PACKAGE_SIZE)
                 {
                     buf[0] = bytesReceived == 0 ? (byte)PackageType.Error : (byte)PackageType.Invalid;
                 }
@@ -586,9 +586,9 @@ namespace MouseWithoutBorders.Class
 
                 if (package.IsBigPackage)
                 {
-                    bytesReceived = decryptedStream.ReadEx(buf, Package.PACKAGE_SIZE, Package.PACKAGE_SIZE);
+                    bytesReceived = decryptedStream.ReadEx(buf, Common.PACKAGE_SIZE, Common.PACKAGE_SIZE);
 
-                    if (bytesReceived != Package.PACKAGE_SIZE)
+                    if (bytesReceived != Common.PACKAGE_SIZE)
                     {
                         buf[0] = bytesReceived == 0 ? (byte)PackageType.Error : (byte)PackageType.Invalid;
                     }
@@ -614,28 +614,28 @@ namespace MouseWithoutBorders.Class
             switch (type)
             {
                 case PackageType.Keyboard:
-                    Package.PackageSent.Keyboard++;
+                    Common.PackageSent.Keyboard++;
                     break;
 
                 case PackageType.Mouse:
-                    Package.PackageSent.Mouse++;
+                    Common.PackageSent.Mouse++;
                     break;
 
                 case PackageType.Heartbeat:
                 case PackageType.Heartbeat_ex:
-                    Package.PackageSent.Heartbeat++;
+                    Common.PackageSent.Heartbeat++;
                     break;
 
                 case PackageType.Hello:
-                    Package.PackageSent.Hello++;
+                    Common.PackageSent.Hello++;
                     break;
 
                 case PackageType.ByeBye:
-                    Package.PackageSent.ByeBye++;
+                    Common.PackageSent.ByeBye++;
                     break;
 
                 case PackageType.Matrix:
-                    Package.PackageSent.Matrix++;
+                    Common.PackageSent.Matrix++;
                     break;
 
                 default:
@@ -643,11 +643,11 @@ namespace MouseWithoutBorders.Class
                     switch (subtype)
                     {
                         case (byte)PackageType.ClipboardText:
-                            Package.PackageSent.ClipboardText++;
+                            Common.PackageSent.ClipboardText++;
                             break;
 
                         case (byte)PackageType.ClipboardImage:
-                            Package.PackageSent.ClipboardImage++;
+                            Common.PackageSent.ClipboardImage++;
                             break;
 
                         default:
@@ -1266,7 +1266,7 @@ namespace MouseWithoutBorders.Class
             string strIP = string.Empty;
             ID remoteID = ID.NONE;
 
-            byte[] buf = RandomNumberGenerator.GetBytes(Package.PACKAGE_SIZE_EX);
+            byte[] buf = RandomNumberGenerator.GetBytes(Common.PACKAGE_SIZE_EX);
             d = new DATA(buf);
 
             TcpSk currentTcp = tcp;
@@ -1280,8 +1280,8 @@ namespace MouseWithoutBorders.Class
 
             try
             {
-                currentSocket.SendBufferSize = Package.PACKAGE_SIZE * 10000;
-                currentSocket.ReceiveBufferSize = Package.PACKAGE_SIZE * 10000;
+                currentSocket.SendBufferSize = Common.PACKAGE_SIZE * 10000;
+                currentSocket.ReceiveBufferSize = Common.PACKAGE_SIZE * 10000;
                 currentSocket.NoDelay = true; // This is very interesting to know:(
                 currentSocket.SendTimeout = 500;
                 d.MachineName = Common.MachineName;
@@ -1829,7 +1829,7 @@ namespace MouseWithoutBorders.Class
                     }
                     while (rv > 0);
 
-                    if ((rv = Package.PACKAGE_SIZE - (sentCount % Package.PACKAGE_SIZE)) > 0)
+                    if ((rv = Common.PACKAGE_SIZE - (sentCount % Common.PACKAGE_SIZE)) > 0)
                     {
                         Array.Clear(buf, 0, buf.Length);
                         ecStream.Write(buf, 0, rv);
@@ -1900,7 +1900,7 @@ namespace MouseWithoutBorders.Class
                 }
                 while (rv > 0);
 
-                if ((rv = sentCount % Package.PACKAGE_SIZE) > 0)
+                if ((rv = sentCount % Common.PACKAGE_SIZE) > 0)
                 {
                     Array.Clear(buf, 0, buf.Length);
                     ecStream.Write(buf, 0, rv);
@@ -1984,7 +1984,7 @@ namespace MouseWithoutBorders.Class
                             if (tcp.MachineId == Setting.Values.MachineId)
                             {
                                 tcp = null;
-                                Setting.Values.MachineId = Encryption.Ran.Next();
+                                Setting.Values.MachineId = Common.Ran.Next();
                                 InitAndCleanup.UpdateMachineTimeAndID();
                                 InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
 

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

@@ -70,7 +70,7 @@ namespace MouseWithoutBorders.Class
                             continue;
                         }
 
-                        if (!WinAPI.IsMyDesktopActive())
+                        if (!Common.IsMyDesktopActive())
                         {
                             // We can just throw the SocketException but to avoid a redundant log entry:
                             throw new ExpectedSocketException($"{nameof(StartServer)}: The desktop is no longer active.");

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

@@ -270,15 +270,15 @@ internal static class Clipboard
             int index = 0;
             int len;
             DATA package = new();
-            byte[] buf = new byte[Package.PACKAGE_SIZE_EX];
-            int dataStart = Package.PACKAGE_SIZE_EX - DATA_SIZE;
+            byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
+            int dataStart = Common.PACKAGE_SIZE_EX - DATA_SIZE;
 
             while (true)
             {
                 if ((index + DATA_SIZE) > l)
                 {
                     len = l - index;
-                    Array.Clear(buf, 0, Package.PACKAGE_SIZE_EX);
+                    Array.Clear(buf, 0, Common.PACKAGE_SIZE_EX);
                 }
                 else
                 {
@@ -315,7 +315,7 @@ internal static class Clipboard
             }
 
             MemoryStream m = new();
-            int dataStart = Package.PACKAGE_SIZE_EX - DATA_SIZE;
+            int dataStart = Common.PACKAGE_SIZE_EX - DATA_SIZE;
             m.Write(data.Bytes, dataStart, DATA_SIZE);
             int unexpectedCount = 0;
 
@@ -809,27 +809,27 @@ internal static class Clipboard
                 MachineName = Common.MachineName,
             };
 
-            byte[] buf = new byte[Package.PACKAGE_SIZE_EX];
+            byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
 
             NetworkStream ns = new(s);
-            enStream = Encryption.GetEncryptedStream(ns);
+            enStream = Common.GetEncryptedStream(ns);
             Common.SendOrReceiveARandomDataBlockPerInitialIV(enStream);
             Logger.LogDebug($"{nameof(ShakeHand)}: Writing header package.");
-            enStream.Write(package.Bytes, 0, Package.PACKAGE_SIZE_EX);
+            enStream.Write(package.Bytes, 0, Common.PACKAGE_SIZE_EX);
 
             Logger.LogDebug($"{nameof(ShakeHand)}: Sent: clientPush={clientPushData}, postAction={postAction}.");
 
-            deStream = Encryption.GetDecryptedStream(ns);
+            deStream = Common.GetDecryptedStream(ns);
             Common.SendOrReceiveARandomDataBlockPerInitialIV(deStream, false);
 
             Logger.LogDebug($"{nameof(ShakeHand)}: Reading header package.");
 
-            int bytesReceived = deStream.ReadEx(buf, 0, Package.PACKAGE_SIZE_EX);
+            int bytesReceived = deStream.ReadEx(buf, 0, Common.PACKAGE_SIZE_EX);
             package.Bytes = buf;
 
             string name = "Unknown";
 
-            if (bytesReceived == Package.PACKAGE_SIZE_EX)
+            if (bytesReceived == Common.PACKAGE_SIZE_EX)
             {
                 if (package.Type is PackageType.Clipboard or PackageType.ClipboardPush)
                 {

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

@@ -1,25 +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.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal enum ClipboardPostAction : uint
-{
-    Other = 0,
-    Desktop = 1,
-    Mspaint = 2,
-}

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

@@ -1,150 +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.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-// In X64, we are WOW
-[module: SuppressMessage("Microsoft.Portability", "CA1900:ValueTypeFieldsShouldBePortable", Scope = "type", Target = "MouseWithoutBorders.Core.DATA", Justification = "Dotnet port with style preservation")]
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-// The beauty of "union" in C#
-[StructLayout(LayoutKind.Explicit)]
-internal sealed class DATA
-{
-    [FieldOffset(0)]
-    internal PackageType Type; // 4 (first byte = package type, 1 = checksum, 2+3 = magic no.)
-
-    [FieldOffset(sizeof(PackageType))]
-    internal int Id; // 4
-
-    [FieldOffset(sizeof(PackageType) + sizeof(uint))]
-    internal ID Src; // 4
-
-    [FieldOffset(sizeof(PackageType) + (2 * sizeof(uint)))]
-    internal ID Des; // 4
-
-    [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
-    internal long DateTime;
-
-    [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)) + sizeof(long))]
-    internal KEYBDDATA Kd;
-
-    [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
-    internal MOUSEDATA Md;
-
-    [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
-    internal ID Machine1;
-
-    [FieldOffset(sizeof(PackageType) + (4 * sizeof(uint)))]
-    internal ID Machine2;
-
-    [FieldOffset(sizeof(PackageType) + (5 * sizeof(uint)))]
-    internal ID Machine3;
-
-    [FieldOffset(sizeof(PackageType) + (6 * sizeof(uint)))]
-    internal ID Machine4;
-
-    [FieldOffset(sizeof(PackageType) + (3 * sizeof(uint)))]
-    internal ClipboardPostAction PostAction;
-
-    [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)))]
-    private long machineNameP1;
-
-    [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + sizeof(long))]
-    private long machineNameP2;
-
-    [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + (2 * sizeof(long)))]
-    private long machineNameP3;
-
-    [FieldOffset(sizeof(PackageType) + (7 * sizeof(uint)) + (3 * sizeof(long)))]
-    private long machineNameP4;
-
-    internal string MachineName
-    {
-        get
-        {
-            string name = Common.GetString(BitConverter.GetBytes(machineNameP1))
-                + Common.GetString(BitConverter.GetBytes(machineNameP2))
-                + Common.GetString(BitConverter.GetBytes(machineNameP3))
-                + Common.GetString(BitConverter.GetBytes(machineNameP4));
-            return name.Trim();
-        }
-
-        set
-        {
-            byte[] machineName = Common.GetBytes(value.PadRight(32, ' '));
-            machineNameP1 = BitConverter.ToInt64(machineName, 0);
-            machineNameP2 = BitConverter.ToInt64(machineName, 8);
-            machineNameP3 = BitConverter.ToInt64(machineName, 16);
-            machineNameP4 = BitConverter.ToInt64(machineName, 24);
-        }
-    }
-
-    public DATA()
-    {
-    }
-
-    public DATA(byte[] initialData)
-    {
-        Bytes = initialData;
-    }
-
-    internal byte[] Bytes
-    {
-        get
-        {
-            byte[] buf = new byte[IsBigPackage ? Package.PACKAGE_SIZE_EX : Package.PACKAGE_SIZE];
-            Array.Copy(StructToBytes(this), buf, IsBigPackage ? Package.PACKAGE_SIZE_EX : Package.PACKAGE_SIZE);
-
-            return buf;
-        }
-
-        set
-        {
-            Debug.Assert(value.Length <= Package.PACKAGE_SIZE_EX, "Length > package size");
-            byte[] buf = new byte[Package.PACKAGE_SIZE_EX];
-            Array.Copy(value, buf, value.Length);
-            BytesToStruct(buf, this);
-        }
-    }
-
-    internal bool IsBigPackage
-    {
-        get => Type == 0
-                ? throw new InvalidOperationException("Package type not set.")
-                : Type switch
-                {
-                    PackageType.Hello or PackageType.Awake or PackageType.Heartbeat or PackageType.Heartbeat_ex or PackageType.Handshake or PackageType.HandshakeAck or PackageType.ClipboardPush or PackageType.Clipboard or PackageType.ClipboardAsk or PackageType.ClipboardImage or PackageType.ClipboardText or PackageType.ClipboardDataEnd => true,
-                    _ => (Type & PackageType.Matrix) == PackageType.Matrix,
-                };
-    }
-
-    private byte[] StructToBytes(object structObject)
-    {
-        byte[] bytes = new byte[Package.PACKAGE_SIZE_EX];
-        GCHandle bHandle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
-        Marshal.StructureToPtr(structObject, Marshal.UnsafeAddrOfPinnedArrayElement(bytes, 0), false);
-        bHandle.Free();
-        return bytes;
-    }
-
-    private void BytesToStruct(byte[] value, object structObject)
-    {
-        GCHandle bHandle = GCHandle.Alloc(value, GCHandleType.Pinned);
-        Marshal.PtrToStructure(Marshal.UnsafeAddrOfPinnedArrayElement(value, 0), structObject);
-        bHandle.Free();
-    }
-}

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

@@ -67,20 +67,20 @@ internal static class DragDrop
             return;
         }
 
-        if (wParam == WM.WM_LBUTTONDOWN)
+        if (wParam == Common.WM_LBUTTONDOWN)
         {
             MouseDown = true;
             DragMachine = MachineStuff.desMachineID;
             MachineStuff.dropMachineID = ID.NONE;
             Logger.LogDebug("DragDropStep01: MouseDown");
         }
-        else if (wParam == WM.WM_LBUTTONUP)
+        else if (wParam == Common.WM_LBUTTONUP)
         {
             MouseDown = false;
             Logger.LogDebug("DragDropStep01: MouseUp");
         }
 
-        if (wParam == WM.WM_RBUTTONUP && IsDropping)
+        if (wParam == Common.WM_RBUTTONUP && IsDropping)
         {
             IsDropping = false;
             Clipboard.LastIDWithClipboardData = ID.NONE;
@@ -252,7 +252,7 @@ internal static class DragDrop
 
     internal static void DragDropStep09(int wParam)
     {
-        if (wParam == WM.WM_MOUSEMOVE && IsDropping)
+        if (wParam == Common.WM_MOUSEMOVE && IsDropping)
         {
             // Show/Move form
             Common.DoSomethingInUIThread(() =>
@@ -260,7 +260,7 @@ internal static class DragDrop
                 _ = NativeMethods.PostMessage(Common.MainForm.Handle, NativeMethods.WM_SHOW_DRAG_DROP, (IntPtr)0, (IntPtr)0);
             });
         }
-        else if (wParam == WM.WM_LBUTTONUP && (IsDropping || IsDragging))
+        else if (wParam == Common.WM_LBUTTONUP && (IsDropping || IsDragging))
         {
             if (IsDropping)
             {

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

@@ -1,245 +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.Collections.Concurrent;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
-
-// <summary>
-//     Encrypt/decrypt implementation.
-// </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 Encryption
-{
-#pragma warning disable SYSLIB0021
-    private static AesCryptoServiceProvider symAl;
-#pragma warning restore SYSLIB0021
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
-    internal static string myKey;
-#pragma warning restore SA1307
-    private static uint magicNumber;
-    private static Random ran = new(); // Used for non encryption related functionality.
-    internal const int SymAlBlockSize = 16;
-
-    /// <summary>
-    /// This is used for the first encryption block, the following blocks will be combined with the cipher text of the previous block.
-    /// Thus identical blocks in the socket stream would be encrypted to different cipher text blocks.
-    /// The first block is a handshake one containing random data.
-    /// Related Unit Test: TestEncryptDecrypt
-    /// </summary>
-    private static readonly string InitialIV = ulong.MaxValue.ToString(CultureInfo.InvariantCulture);
-
-    internal static Random Ran
-    {
-        get => Encryption.ran ??= new Random();
-        set => Encryption.ran = value;
-    }
-
-    internal static uint MagicNumber
-    {
-        get => Encryption.magicNumber;
-        set => Encryption.magicNumber = value;
-    }
-
-    internal static string MyKey
-    {
-        get => Encryption.myKey;
-
-        set
-        {
-            if (Encryption.myKey != value)
-            {
-                Encryption.myKey = value;
-                _ = Task.Factory.StartNew(
-                    () => Encryption.GenLegalKey(),
-                    System.Threading.CancellationToken.None,
-                    TaskCreationOptions.None,
-                    TaskScheduler.Default); // Cache the key to improve UX.
-            }
-        }
-    }
-
-    private static string KeyDisplayedText(string key)
-    {
-        string displayedValue = string.Empty;
-        int i = 0;
-
-        do
-        {
-            int length = Math.Min(4, key.Length - i);
-            displayedValue += string.Concat(key.AsSpan(i, length), "  ");
-            i += 4;
-        }
-        while (i < key.Length - 1);
-
-        return displayedValue.Trim();
-    }
-
-    internal static bool GeneratedKey { get; set; }
-
-    internal static bool KeyCorrupted { get; set; }
-
-    internal static void InitEncryption()
-    {
-        try
-        {
-            if (symAl == null)
-            {
-#pragma warning disable SYSLIB0021 // No proper replacement for now
-                symAl = new AesCryptoServiceProvider();
-#pragma warning restore SYSLIB0021
-                symAl.KeySize = 256;
-                symAl.BlockSize = SymAlBlockSize * 8;
-                symAl.Padding = PaddingMode.Zeros;
-                symAl.Mode = CipherMode.CBC;
-                symAl.GenerateIV();
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-    private static readonly ConcurrentDictionary<string, byte[]> LegalKeyDictionary = new(StringComparer.OrdinalIgnoreCase);
-
-    private static byte[] GenLegalKey()
-    {
-        byte[] rv;
-        string myKey = Encryption.MyKey;
-
-        if (!LegalKeyDictionary.TryGetValue(myKey, out byte[] value))
-        {
-            Rfc2898DeriveBytes key = new(
-                myKey,
-                Common.GetBytesU(InitialIV),
-                50000,
-                HashAlgorithmName.SHA512);
-            rv = key.GetBytes(32);
-            _ = LegalKeyDictionary.AddOrUpdate(myKey, rv, (k, v) => rv);
-        }
-        else
-        {
-            rv = value;
-        }
-
-        return rv;
-    }
-
-    private static byte[] GenLegalIV()
-    {
-        string st = InitialIV;
-        int ivLength = symAl.IV.Length;
-        if (st.Length > ivLength)
-        {
-            st = st[..ivLength];
-        }
-        else if (st.Length < ivLength)
-        {
-            st = st.PadRight(ivLength, ' ');
-        }
-
-        return Common.GetBytes(st);
-    }
-
-    internal static Stream GetEncryptedStream(Stream encryptedStream)
-    {
-        ICryptoTransform encryptor;
-        encryptor = symAl.CreateEncryptor(GenLegalKey(), GenLegalIV());
-        return new CryptoStream(encryptedStream, encryptor, CryptoStreamMode.Write);
-    }
-
-    internal static Stream GetDecryptedStream(Stream encryptedStream)
-    {
-        ICryptoTransform decryptor;
-        decryptor = symAl.CreateDecryptor(GenLegalKey(), GenLegalIV());
-        return new CryptoStream(encryptedStream, decryptor, CryptoStreamMode.Read);
-    }
-
-    internal static uint Get24BitHash(string st)
-    {
-        if (string.IsNullOrEmpty(st))
-        {
-            return 0;
-        }
-
-        byte[] bytes = new byte[Package.PACKAGE_SIZE];
-        for (int i = 0; i < Package.PACKAGE_SIZE; i++)
-        {
-            if (i < st.Length)
-            {
-                bytes[i] = (byte)st[i];
-            }
-        }
-
-        var hash = SHA512.Create();
-        byte[] hashValue = hash.ComputeHash(bytes);
-
-        for (int i = 0; i < 50000; i++)
-        {
-            hashValue = hash.ComputeHash(hashValue);
-        }
-
-        Logger.LogDebug(string.Format(CultureInfo.CurrentCulture, "magic: {0},{1},{2}", hashValue[0], hashValue[1], hashValue[^1]));
-        hash.Clear();
-        return (uint)((hashValue[0] << 23) + (hashValue[1] << 16) + (hashValue[^1] << 8) + hashValue[2]);
-    }
-
-    internal static string GetDebugInfo(string st)
-    {
-        return string.IsNullOrEmpty(st) ? st : ((byte)(Common.GetBytesU(st).Sum(value => value) % 256)).ToString(CultureInfo.InvariantCulture);
-    }
-
-    internal static string CreateDefaultKey()
-    {
-        return CreateRandomKey();
-    }
-
-    private const int PW_LENGTH = 16;
-
-    internal static string CreateRandomKey()
-    {
-        // Not including characters like "'`O0& since they are confusing to users.
-        string[] chars = new[] { "abcdefghjkmnpqrstuvxyz", "ABCDEFGHJKMNPQRSTUVXYZ", "123456789", "~!@#$%^*()_-+=:;<,>.?/\\|[]" };
-        char[][] charactersUsedForKey = chars.Select(charset => Enumerable.Range(0, charset.Length - 1).Select(i => charset[i]).ToArray()).ToArray();
-        byte[] randomData = new byte[1];
-        string key = string.Empty;
-
-        do
-        {
-            foreach (string set in chars)
-            {
-                randomData = RandomNumberGenerator.GetBytes(1);
-                key += set[randomData[0] % set.Length];
-
-                if (key.Length >= PW_LENGTH)
-                {
-                    break;
-                }
-            }
-        }
-        while (key.Length < PW_LENGTH);
-
-        return key;
-    }
-
-    internal static bool IsKeyValid(string key, out string error)
-    {
-        error = string.IsNullOrEmpty(key) || key.Length < 16
-            ? "Key must have at least 16 characters in length (spaces are discarded). Key must be auto generated in one of the machines."
-            : null;
-
-        return error == null;
-    }
-}

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

@@ -70,7 +70,7 @@ internal static class Event
             // Check if easy mouse setting is enabled.
             bool isEasyMouseEnabled = IsSwitchingByMouseEnabled();
 
-            if (isEasyMouseEnabled && Common.Sk != null && (Common.DesMachineID == Common.MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == WM.WM_MOUSEMOVE)
+            if (isEasyMouseEnabled && Common.Sk != null && (Common.DesMachineID == Common.MachineID || !Setting.Values.MoveMouseRelatively) && e.dwFlags == Common.WM_MOUSEMOVE)
             {
                 Point p = MachineStuff.MoveToMyNeighbourIfNeeded(e.X, e.Y, MachineStuff.desMachineID);
 
@@ -115,7 +115,7 @@ internal static class Event
 
                 Common.SkSend(MousePackage, null, false);
 
-                if (MousePackage.Md.dwFlags is WM.WM_LBUTTONUP or WM.WM_RBUTTONUP)
+                if (MousePackage.Md.dwFlags is Common.WM_LBUTTONUP or Common.WM_RBUTTONUP)
                 {
                     Thread.Sleep(10);
                 }
@@ -265,7 +265,7 @@ internal static class Event
                 KeybdPackage.Kd = e;
                 KeybdPackage.DateTime = Common.GetTick();
                 Common.SkSend(KeybdPackage, null, false);
-                if (KeybdPackage.Kd.dwFlags is WM.WM_KEYUP or WM.WM_SYSKEYUP)
+                if (KeybdPackage.Kd.dwFlags is Common.WM_KEYUP or Common.WM_SYSKEYUP)
                 {
                     Thread.Sleep(10);
                 }

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

@@ -290,7 +290,7 @@ internal static class Helper
             return;
         }
 
-        if (!WinAPI.IsMyDesktopActive())
+        if (!Common.IsMyDesktopActive())
         {
             return;
         }
@@ -314,7 +314,7 @@ internal static class Helper
             _ = Launch.CreateProcessInInputDesktopSession(
                 $"\"{Path.GetDirectoryName(Application.ExecutablePath)}\\{HelperProcessName}.exe\"",
                 string.Empty,
-                WinAPI.GetInputDesktop(),
+                Common.GetInputDesktop(),
                 0);
 
             Clipboard.HasSwitchedMachineSinceLastCopy = true;
@@ -379,7 +379,7 @@ internal static class Helper
         log += "=============================================================================================================================\r\n";
         log += $"{Application.ProductName} version {Application.ProductVersion}\r\n";
 
-        log += $"{Setting.Values.Username}/{Encryption.GetDebugInfo(Encryption.MyKey)}\r\n";
+        log += $"{Setting.Values.Username}/{Common.GetDebugInfo(Common.MyKey)}\r\n";
         log += $"{Common.MachineName}/{Common.MachineID}/{Common.DesMachineID}\r\n";
         log += $"Id: {Setting.Values.DeviceId}\r\n";
         log += $"Matrix: {string.Join(",", MachineStuff.MachineMatrix)}\r\n";

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

@@ -1,19 +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.
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal enum ID : uint
-{
-    NONE = 0,
-    ALL = 255,
-}

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

@@ -89,23 +89,23 @@ internal static class InitAndCleanup
     internal static void Init()
     {
         _ = Helper.GetUserName();
-        Encryption.GeneratedKey = true;
+        Common.GeneratedKey = true;
 
         try
         {
-            Encryption.MyKey = Setting.Values.MyKey;
+            Common.MyKey = Setting.Values.MyKey;
             int tmp = Setting.Values.MyKeyDaysToExpire;
         }
         catch (FormatException e)
         {
-            Encryption.KeyCorrupted = true;
-            Setting.Values.MyKey = Encryption.MyKey = Encryption.CreateRandomKey();
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
             Logger.Log(e.Message);
         }
         catch (CryptographicException e)
         {
-            Encryption.KeyCorrupted = true;
-            Setting.Values.MyKey = Encryption.MyKey = Encryption.CreateRandomKey();
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
             Logger.Log(e.Message);
         }
 
@@ -127,14 +127,14 @@ internal static class InitAndCleanup
         bool dummy = Setting.Values.DrawMouseEx;
         Common.Is64bitOS = IntPtr.Size == 8;
         Common.tcpPort = Setting.Values.TcpPort;
-        WinAPI.GetScreenConfig();
-        Package.PackageSent = new PackageMonitor(0);
-        Package.PackageReceived = new PackageMonitor(0);
+        Common.GetScreenConfig();
+        Common.PackageSent = new PackageMonitor(0);
+        Common.PackageReceived = new PackageMonitor(0);
         SetupMachineNameAndID();
-        Encryption.InitEncryption();
+        Common.InitEncryption();
         CreateHelperThreads();
 
-        SystemEvents.DisplaySettingsChanged += new EventHandler(WinAPI.SystemEvents_DisplaySettingsChanged);
+        SystemEvents.DisplaySettingsChanged += new EventHandler(Common.SystemEvents_DisplaySettingsChanged);
         NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
         SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
         PleaseReopenSocket = 9;
@@ -220,7 +220,7 @@ internal static class InitAndCleanup
         lastReleaseAllKeysCall = Common.GetTick();
 
         KEYBDDATA kd;
-        kd.dwFlags = (int)WM.LLKHF.UP;
+        kd.dwFlags = (int)Common.LLKHF.UP;
 
         VK[] keys = new VK[]
         {
@@ -266,7 +266,7 @@ internal static class InitAndCleanup
                 true);
         }
 
-        if (!WinAPI.IsMyDesktopActive())
+        if (!Common.IsMyDesktopActive())
         {
             PleaseReopenSocket = 0;
         }

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

@@ -1,25 +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.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct KEYBDDATA
-{
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
-    internal int wVk;
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
-    internal int dwFlags;
-}

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

@@ -121,52 +121,52 @@ internal static class Logger
     {
         string log;
 
-        if (!lastPackageSent.Equals(Package.PackageSent))
+        if (!lastPackageSent.Equals(Common.PackageSent))
         {
             log = string.Format(
                 CultureInfo.CurrentCulture,
                 "SENT:" + HeaderSENT,
-                Package.PackageSent.Heartbeat,
-                Package.PackageSent.Keyboard,
-                Package.PackageSent.Mouse,
-                Package.PackageSent.Hello,
-                Package.PackageSent.Matrix,
-                Package.PackageSent.ClipboardText,
-                Package.PackageSent.ClipboardImage,
-                Package.PackageSent.ByeBye,
-                Package.PackageSent.Clipboard,
-                Package.PackageSent.ClipboardDragDrop,
-                Package.PackageSent.ClipboardDragDropEnd,
-                Package.PackageSent.ExplorerDragDrop,
+                Common.PackageSent.Heartbeat,
+                Common.PackageSent.Keyboard,
+                Common.PackageSent.Mouse,
+                Common.PackageSent.Hello,
+                Common.PackageSent.Matrix,
+                Common.PackageSent.ClipboardText,
+                Common.PackageSent.ClipboardImage,
+                Common.PackageSent.ByeBye,
+                Common.PackageSent.Clipboard,
+                Common.PackageSent.ClipboardDragDrop,
+                Common.PackageSent.ClipboardDragDropEnd,
+                Common.PackageSent.ExplorerDragDrop,
                 Event.inputEventCount,
-                Package.PackageSent.Nil);
+                Common.PackageSent.Nil);
             Log(log);
-            lastPackageSent = Package.PackageSent; // Copy data
+            lastPackageSent = Common.PackageSent; // Copy data
         }
 
-        if (!lastPackageReceived.Equals(Package.PackageReceived))
+        if (!lastPackageReceived.Equals(Common.PackageReceived))
         {
             log = string.Format(
                 CultureInfo.CurrentCulture,
                 "RECEIVED:" + HeaderRECEIVED,
-                Package.PackageReceived.Heartbeat,
-                Package.PackageReceived.Keyboard,
-                Package.PackageReceived.Mouse,
-                Package.PackageReceived.Hello,
-                Package.PackageReceived.Matrix,
-                Package.PackageReceived.ClipboardText,
-                Package.PackageReceived.ClipboardImage,
-                Package.PackageReceived.ByeBye,
-                Package.PackageReceived.Clipboard,
-                Package.PackageReceived.ClipboardDragDrop,
-                Package.PackageReceived.ClipboardDragDropEnd,
-                Package.PackageReceived.ExplorerDragDrop,
+                Common.PackageReceived.Heartbeat,
+                Common.PackageReceived.Keyboard,
+                Common.PackageReceived.Mouse,
+                Common.PackageReceived.Hello,
+                Common.PackageReceived.Matrix,
+                Common.PackageReceived.ClipboardText,
+                Common.PackageReceived.ClipboardImage,
+                Common.PackageReceived.ByeBye,
+                Common.PackageReceived.Clipboard,
+                Common.PackageReceived.ClipboardDragDrop,
+                Common.PackageReceived.ClipboardDragDropEnd,
+                Common.PackageReceived.ExplorerDragDrop,
                 Event.invalidPackageCount,
-                Package.PackageReceived.Nil,
+                Common.PackageReceived.Nil,
                 Receiver.processedPackageCount,
                 Receiver.skippedPackageCount);
             Log(log);
-            lastPackageReceived = Package.PackageReceived;
+            lastPackageReceived = Common.PackageReceived;
         }
     }
 
@@ -209,9 +209,9 @@ internal static class Logger
                 "Private Mem: " + (Process.GetCurrentProcess().PrivateMemorySize64 / 1024).ToString(CultureInfo.CurrentCulture) + "KB",
                 sb.ToString());
 
-            if (!string.IsNullOrEmpty(Encryption.myKey))
+            if (!string.IsNullOrEmpty(Common.myKey))
             {
-                log = log.Replace(Encryption.MyKey, Encryption.GetDebugInfo(Encryption.MyKey));
+                log = log.Replace(Common.MyKey, Common.GetDebugInfo(Common.MyKey));
             }
 
             log += Thread.DumpThreadsStack();
@@ -251,18 +251,14 @@ internal static class Logger
         {
             typeof(Clipboard),
             typeof(DragDrop),
-            typeof(Encryption),
             typeof(Event),
             typeof(InitAndCleanup),
             typeof(Helper),
             typeof(Launch),
             typeof(Logger),
             typeof(MachineStuff),
-            typeof(Package),
             typeof(Receiver),
             typeof(Service),
-            typeof(WinAPI),
-            typeof(WM),
         };
         foreach (var staticType in staticTypes)
         {
@@ -298,7 +294,7 @@ internal static class Logger
         // strArr[3] = t.FullName;
         strArr[4] = " = ";
         strArr[5] = objName.Equals("myKey", StringComparison.OrdinalIgnoreCase)
-            ? Encryption.GetDebugInfo(objString)
+            ? Common.GetDebugInfo(objString)
             : objName.Equals("lastClipboardObject", StringComparison.OrdinalIgnoreCase)
                 ? string.Empty
                 : objString

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

@@ -1,26 +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.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct MOUSEDATA
-{
-    internal int X;
-    internal int Y;
-    internal int WheelDelta;
-    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Same name as in winAPI")]
-    internal int dwFlags;
-}

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

@@ -221,9 +221,9 @@ internal static class MachineStuff
 
         if (Setting.Values.BlockMouseAtCorners)
         {
-            lock (WinAPI.SensitivePoints)
+            lock (Common.SensitivePoints)
             {
-                foreach (Point p in WinAPI.SensitivePoints)
+                foreach (Point p in Common.SensitivePoints)
                 {
                     if (Math.Abs(p.X - x) < 100 && Math.Abs(p.Y - y) < 100)
                     {
@@ -793,8 +793,8 @@ internal static class MachineStuff
     internal static void ShowSetupForm(bool reopenSockets = false)
     {
         Logger.LogDebug("========== BEGIN THE SETUP EXPERIENCE ==========", true);
-        Setting.Values.MyKey = Encryption.MyKey = Encryption.CreateRandomKey();
-        Encryption.GeneratedKey = true;
+        Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+        Common.GeneratedKey = true;
 
         if (Process.GetCurrentProcess().SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
         {
@@ -1067,7 +1067,7 @@ internal static class MachineStuff
 
     internal static void AssertOneInstancePerDesktopSession()
     {
-        string eventName = $"Global\\{Application.ProductName}-{FrmAbout.AssemblyVersion}-{WinAPI.GetMyDesktop()}-{Common.CurrentProcess.SessionId}";
+        string eventName = $"Global\\{Application.ProductName}-{FrmAbout.AssemblyVersion}-{Common.GetMyDesktop()}-{Common.CurrentProcess.SessionId}";
         oneInstanceCheck = new EventWaitHandle(false, EventResetMode.ManualReset, eventName, out bool created);
 
         if (!created)

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

@@ -1,23 +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.
-
-// <summary>
-//     Package format/conversion.
-// </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 Package
-{
-    internal const byte PACKAGE_SIZE = 32;
-    internal const byte PACKAGE_SIZE_EX = 64;
-    private const byte WP_PACKAGE_SIZE = 6;
-    internal static PackageMonitor PackageSent;
-    internal static PackageMonitor PackageReceived;
-    internal static int PackageID;
-}

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

@@ -1,38 +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.
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal struct PackageMonitor
-{
-    internal ulong Keyboard;
-    internal ulong Mouse;
-    internal ulong Heartbeat;
-    internal ulong ByeBye;
-    internal ulong Hello;
-    internal ulong Matrix;
-    internal ulong ClipboardText;
-    internal ulong ClipboardImage;
-    internal ulong Clipboard;
-    internal ulong ClipboardDragDrop;
-    internal ulong ClipboardDragDropEnd;
-    internal ulong ClipboardAsk;
-    internal ulong ExplorerDragDrop;
-    internal ulong Nil;
-
-    internal PackageMonitor(ulong value)
-    {
-        ClipboardDragDrop = ClipboardDragDropEnd = ExplorerDragDrop =
-            Keyboard = Mouse = Heartbeat = ByeBye = Hello = Clipboard =
-            Matrix = ClipboardImage = ClipboardText = Nil = ClipboardAsk = value;
-    }
-}

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

@@ -1,57 +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.
-
-// <summary>
-//     Package format/conversion.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal enum PackageType // : int
-{
-    // Search for PACKAGE_TYPE_RELATED before changing these!
-    Invalid = 0xFF,
-
-    Error = 0xFE,
-
-    Hi = 2,
-    Hello = 3,
-    ByeBye = 4,
-
-    Heartbeat = 20,
-    Awake = 21,
-    HideMouse = 50,
-    Heartbeat_ex = 51,
-    Heartbeat_ex_l2 = 52,
-    Heartbeat_ex_l3 = 53,
-
-    Clipboard = 69,
-    ClipboardDragDrop = 70,
-    ClipboardDragDropEnd = 71,
-    ExplorerDragDrop = 72,
-    ClipboardCapture = 73,
-    CaptureScreenCommand = 74,
-    ClipboardDragDropOperation = 75,
-    ClipboardDataEnd = 76,
-    MachineSwitched = 77,
-    ClipboardAsk = 78,
-    ClipboardPush = 79,
-
-    NextMachine = 121,
-    Keyboard = 122,
-    Mouse = 123,
-    ClipboardText = 124,
-    ClipboardImage = 125,
-
-    Handshake = 126,
-    HandshakeAck = 127,
-
-    Matrix = 128,
-    MatrixSwapFlag = 2,
-    MatrixTwoRowFlag = 4,
-}

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

@@ -93,7 +93,7 @@ internal static class Receiver
         switch (package.Type)
         {
             case PackageType.Keyboard:
-                Package.PackageReceived.Keyboard++;
+                Common.PackageReceived.Keyboard++;
                 if (package.Des == Common.MachineID || package.Des == ID.ALL)
                 {
                     JustGotAKey = Common.GetTick();
@@ -102,7 +102,7 @@ internal static class Receiver
                     bool nonElevated = Common.RunWithNoAdminRight && false;
                     if (nonElevated && Setting.Values.OneWayControlMode)
                     {
-                        if ((package.Kd.dwFlags & (int)WM.LLKHF.UP) == (int)WM.LLKHF.UP)
+                        if ((package.Kd.dwFlags & (int)Common.LLKHF.UP) == (int)Common.LLKHF.UP)
                         {
                             Helper.ShowOneWayModeMessage();
                         }
@@ -116,7 +116,7 @@ internal static class Receiver
                 break;
 
             case PackageType.Mouse:
-                Package.PackageReceived.Mouse++;
+                Common.PackageReceived.Mouse++;
 
                 if (package.Des == Common.MachineID || package.Des == ID.ALL)
                 {
@@ -127,16 +127,16 @@ internal static class Receiver
 
                     // NOTE(@yuyoyuppe): disabled to drop elevation requirement
                     bool nonElevated = Common.RunWithNoAdminRight && false;
-                    if (nonElevated && Setting.Values.OneWayControlMode && package.Md.dwFlags != WM.WM_MOUSEMOVE)
+                    if (nonElevated && Setting.Values.OneWayControlMode && package.Md.dwFlags != Common.WM_MOUSEMOVE)
                     {
                         if (!DragDrop.IsDropping)
                         {
-                            if (package.Md.dwFlags is WM.WM_LBUTTONDOWN or WM.WM_RBUTTONDOWN)
+                            if (package.Md.dwFlags is Common.WM_LBUTTONDOWN or Common.WM_RBUTTONDOWN)
                             {
                                 Helper.ShowOneWayModeMessage();
                             }
                         }
-                        else if (package.Md.dwFlags is WM.WM_LBUTTONUP or WM.WM_RBUTTONUP)
+                        else if (package.Md.dwFlags is Common.WM_LBUTTONUP or Common.WM_RBUTTONUP)
                         {
                             DragDrop.IsDropping = false;
                         }
@@ -146,7 +146,7 @@ internal static class Receiver
 
                     if (Math.Abs(package.Md.X) >= Event.MOVE_MOUSE_RELATIVE && Math.Abs(package.Md.Y) >= Event.MOVE_MOUSE_RELATIVE)
                     {
-                        if (package.Md.dwFlags == WM.WM_MOUSEMOVE)
+                        if (package.Md.dwFlags == Common.WM_MOUSEMOVE)
                         {
                             InputSimulation.MoveMouseRelative(
                                 package.Md.X < 0 ? package.Md.X + Event.MOVE_MOUSE_RELATIVE : package.Md.X - Event.MOVE_MOUSE_RELATIVE,
@@ -203,19 +203,19 @@ internal static class Receiver
                 break;
 
             case PackageType.ExplorerDragDrop:
-                Package.PackageReceived.ExplorerDragDrop++;
+                Common.PackageReceived.ExplorerDragDrop++;
                 DragDrop.DragDropStep03(package);
                 break;
 
             case PackageType.Heartbeat:
             case PackageType.Heartbeat_ex:
-                Package.PackageReceived.Heartbeat++;
+                Common.PackageReceived.Heartbeat++;
 
-                Encryption.GeneratedKey = Encryption.GeneratedKey || package.Type == PackageType.Heartbeat_ex;
+                Common.GeneratedKey = Common.GeneratedKey || package.Type == PackageType.Heartbeat_ex;
 
-                if (Encryption.GeneratedKey)
+                if (Common.GeneratedKey)
                 {
-                    Setting.Values.MyKey = Encryption.MyKey;
+                    Setting.Values.MyKey = Common.MyKey;
                     Common.SendPackage(ID.ALL, PackageType.Heartbeat_ex_l2);
                 }
 
@@ -230,26 +230,26 @@ internal static class Receiver
                 break;
 
             case PackageType.Heartbeat_ex_l2:
-                Encryption.GeneratedKey = true;
-                Setting.Values.MyKey = Encryption.MyKey;
+                Common.GeneratedKey = true;
+                Setting.Values.MyKey = Common.MyKey;
                 Common.SendPackage(ID.ALL, PackageType.Heartbeat_ex_l3);
 
                 break;
 
             case PackageType.Heartbeat_ex_l3:
-                Encryption.GeneratedKey = true;
-                Setting.Values.MyKey = Encryption.MyKey;
+                Common.GeneratedKey = true;
+                Setting.Values.MyKey = Common.MyKey;
 
                 break;
 
             case PackageType.Awake:
-                Package.PackageReceived.Heartbeat++;
+                Common.PackageReceived.Heartbeat++;
                 _ = MachineStuff.AddToMachinePool(package);
                 Common.HumanBeingDetected();
                 break;
 
             case PackageType.Hello:
-                Package.PackageReceived.Hello++;
+                Common.PackageReceived.Hello++;
                 Common.SendHeartBeat();
                 string newMachine = MachineStuff.AddToMachinePool(package);
                 if (Setting.Values.MachineMatrixString == null)
@@ -262,16 +262,16 @@ internal static class Receiver
                 break;
 
             case PackageType.Hi:
-                Package.PackageReceived.Hello++;
+                Common.PackageReceived.Hello++;
                 break;
 
             case PackageType.ByeBye:
-                Package.PackageReceived.ByeBye++;
+                Common.PackageReceived.ByeBye++;
                 Common.ProcessByeByeMessage(package);
                 break;
 
             case PackageType.Clipboard:
-                Package.PackageReceived.Clipboard++;
+                Common.PackageReceived.Clipboard++;
                 if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                 {
                     Clipboard.clipboardCopiedTime = Common.GetTick();
@@ -291,7 +291,7 @@ internal static class Receiver
                 break;
 
             case PackageType.ClipboardCapture:
-                Package.PackageReceived.Clipboard++;
+                Common.PackageReceived.Clipboard++;
                 if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                 {
                     if (package.Des == Common.MachineID || package.Des == ID.ALL)
@@ -304,7 +304,7 @@ internal static class Receiver
                 break;
 
             case PackageType.CaptureScreenCommand:
-                Package.PackageReceived.Clipboard++;
+                Common.PackageReceived.Clipboard++;
                 if (package.Des == Common.MachineID || package.Des == ID.ALL)
                 {
                     Common.SendImage(package.Src, Common.CaptureScreen());
@@ -313,7 +313,7 @@ internal static class Receiver
                 break;
 
             case PackageType.ClipboardAsk:
-                Package.PackageReceived.ClipboardAsk++;
+                Common.PackageReceived.ClipboardAsk++;
 
                 if (package.Des == Common.MachineID)
                 {
@@ -344,17 +344,17 @@ internal static class Receiver
                 break;
 
             case PackageType.ClipboardDragDrop:
-                Package.PackageReceived.ClipboardDragDrop++;
+                Common.PackageReceived.ClipboardDragDrop++;
                 DragDrop.DragDropStep08(package);
                 break;
 
             case PackageType.ClipboardDragDropOperation:
-                Package.PackageReceived.ClipboardDragDrop++;
+                Common.PackageReceived.ClipboardDragDrop++;
                 DragDrop.DragDropStep08_2(package);
                 break;
 
             case PackageType.ClipboardDragDropEnd:
-                Package.PackageReceived.ClipboardDragDropEnd++;
+                Common.PackageReceived.ClipboardDragDropEnd++;
                 DragDrop.DragDropStep12();
                 break;
 
@@ -363,11 +363,11 @@ internal static class Receiver
                 Clipboard.clipboardCopiedTime = 0;
                 if (package.Type == PackageType.ClipboardImage)
                 {
-                    Package.PackageReceived.ClipboardImage++;
+                    Common.PackageReceived.ClipboardImage++;
                 }
                 else
                 {
-                    Package.PackageReceived.ClipboardText++;
+                    Common.PackageReceived.ClipboardText++;
                 }
 
                 if (tcp != null)
@@ -390,7 +390,7 @@ internal static class Receiver
             default:
                 if ((package.Type & PackageType.Matrix) == PackageType.Matrix)
                 {
-                    Package.PackageReceived.Matrix++;
+                    Common.PackageReceived.Matrix++;
                     MachineStuff.UpdateMachineMatrix(package);
                     break;
                 }

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

@@ -1,29 +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 ManagedCommon;
-using Microsoft.PowerToys.Telemetry;
-
-namespace MouseWithoutBorders.Core;
-
-internal static class ShutdownWithPowerToys
-{
-    internal static void WaitForPowerToysRunner(ETWTrace etwTrace)
-    {
-        try
-        {
-            RunnerHelper.WaitForPowerToysRunnerExitFallback(() =>
-                {
-                    etwTrace?.Dispose();
-                    Common.MainForm.Quit(true, false);
-                });
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-}

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

@@ -1,88 +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.
-
-// <summary>
-//     Virtual key constants.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal enum VK : ushort
-{
-    CAPITAL = 0x14,
-    NUMLOCK = 0x90,
-    SHIFT = 0x10,
-    CONTROL = 0x11,
-    MENU = 0x12,
-    ESCAPE = 0x1B,
-    BACK = 0x08,
-    TAB = 0x09,
-    RETURN = 0x0D,
-    PRIOR = 0x21,
-    NEXT = 0x22,
-    END = 0x23,
-    HOME = 0x24,
-    LEFT = 0x25,
-    UP = 0x26,
-    RIGHT = 0x27,
-    DOWN = 0x28,
-    SELECT = 0x29,
-    PRINT = 0x2A,
-    EXECUTE = 0x2B,
-    SNAPSHOT = 0x2C,
-    INSERT = 0x2D,
-    DELETE = 0x2E,
-    HELP = 0x2F,
-    NUMPAD0 = 0x60,
-    NUMPAD1 = 0x61,
-    NUMPAD2 = 0x62,
-    NUMPAD3 = 0x63,
-    NUMPAD4 = 0x64,
-    NUMPAD5 = 0x65,
-    NUMPAD6 = 0x66,
-    NUMPAD7 = 0x67,
-    NUMPAD8 = 0x68,
-    NUMPAD9 = 0x69,
-    MULTIPLY = 0x6A,
-    ADD = 0x6B,
-    SEPARATOR = 0x6C,
-    SUBTRACT = 0x6D,
-    DECIMAL = 0x6E,
-    DIVIDE = 0x6F,
-    F1 = 0x70,
-    F2 = 0x71,
-    F3 = 0x72,
-    F4 = 0x73,
-    F5 = 0x74,
-    F6 = 0x75,
-    F7 = 0x76,
-    F8 = 0x77,
-    F9 = 0x78,
-    F10 = 0x79,
-    F11 = 0x7A,
-    F12 = 0x7B,
-    OEM_1 = 0xBA,
-    OEM_PLUS = 0xBB,
-    OEM_COMMA = 0xBC,
-    OEM_MINUS = 0xBD,
-    OEM_PERIOD = 0xBE,
-    OEM_2 = 0xBF,
-    OEM_3 = 0xC0,
-    MEDIA_NEXT_TRACK = 0xB0,
-    MEDIA_PREV_TRACK = 0xB1,
-    MEDIA_STOP = 0xB2,
-    MEDIA_PLAY_PAUSE = 0xB3,
-    LWIN = 0x5B,
-    RWIN = 0x5C,
-    LSHIFT = 0xA0,
-    RSHIFT = 0xA1,
-    LCONTROL = 0xA2,
-    RCONTROL = 0xA3,
-    LMENU = 0xA4,
-    RMENU = 0xA5,
-}

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

@@ -1,55 +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;
-
-// <summary>
-//     Virtual key constants.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-internal partial class WM
-{
-    internal const ushort KEYEVENTF_KEYDOWN = 0x0001;
-    internal const ushort KEYEVENTF_KEYUP = 0x0002;
-
-    internal const int WH_MOUSE = 7;
-    internal const int WH_KEYBOARD = 2;
-    internal const int WH_MOUSE_LL = 14;
-    internal const int WH_KEYBOARD_LL = 13;
-
-    internal const int WM_MOUSEMOVE = 0x200;
-    internal const int WM_LBUTTONDOWN = 0x201;
-    internal const int WM_RBUTTONDOWN = 0x204;
-    internal const int WM_MBUTTONDOWN = 0x207;
-    internal const int WM_XBUTTONDOWN = 0x20B;
-    internal const int WM_LBUTTONUP = 0x202;
-    internal const int WM_RBUTTONUP = 0x205;
-    internal const int WM_MBUTTONUP = 0x208;
-    internal const int WM_XBUTTONUP = 0x20C;
-    internal const int WM_LBUTTONDBLCLK = 0x203;
-    internal const int WM_RBUTTONDBLCLK = 0x206;
-    internal const int WM_MBUTTONDBLCLK = 0x209;
-    internal const int WM_MOUSEWHEEL = 0x020A;
-    internal const int WM_MOUSEHWHEEL = 0x020E;
-
-    internal const int WM_KEYDOWN = 0x100;
-    internal const int WM_KEYUP = 0x101;
-    internal const int WM_SYSKEYDOWN = 0x104;
-    internal const int WM_SYSKEYUP = 0x105;
-
-    [Flags]
-    internal enum LLKHF
-    {
-        EXTENDED = 0x01,
-        INJECTED = 0x10,
-        ALTDOWN = 0x20,
-        UP = 0x80,
-    }
-}

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

@@ -1,359 +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.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Windows.Forms;
-
-using MouseWithoutBorders.Class;
-
-// <summary>
-//     Screen/Desktop helper functions.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-namespace MouseWithoutBorders.Core;
-
-// Desktops, and GetScreenConfig routines
-internal static class WinAPI
-{
-    private static MyRectangle newDesktopBounds;
-    private static MyRectangle newPrimaryScreenBounds;
-    private static string activeDesktop;
-
-    private static string ActiveDesktop => WinAPI.activeDesktop;
-
-    internal static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
-    {
-        GetScreenConfig();
-    }
-
-    internal static readonly List<Point> SensitivePoints = new();
-
-    private static bool MonitorEnumProc(IntPtr hMonitor, IntPtr hdcMonitor, ref NativeMethods.RECT lprcMonitor, IntPtr dwData)
-    {
-        // lprcMonitor is wrong!!! => using GetMonitorInfo(...)
-        // Log(String.Format( CultureInfo.CurrentCulture,"MONITOR: l{0}, t{1}, r{2}, b{3}", lprcMonitor.Left, lprcMonitor.Top, lprcMonitor.Right, lprcMonitor.Bottom));
-        NativeMethods.MonitorInfoEx mi = default;
-        mi.cbSize = Marshal.SizeOf(mi);
-        _ = NativeMethods.GetMonitorInfo(hMonitor, ref mi);
-
-        try
-        {
-            // For logging only
-            _ = NativeMethods.GetDpiForMonitor(hMonitor, 0, out uint dpiX, out uint dpiY);
-            Logger.Log(string.Format(CultureInfo.CurrentCulture, "MONITOR: ({0}, {1}, {2}, {3}). DPI: ({4}, {5})", mi.rcMonitor.Left, mi.rcMonitor.Top, mi.rcMonitor.Right, mi.rcMonitor.Bottom, dpiX, dpiY));
-        }
-        catch (DllNotFoundException)
-        {
-            Logger.Log("GetDpiForMonitor is unsupported in Windows 7 and lower.");
-        }
-        catch (EntryPointNotFoundException)
-        {
-            Logger.Log("GetDpiForMonitor is unsupported in Windows 7 and lower.");
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-
-        if (mi.rcMonitor.Left == 0 && mi.rcMonitor.Top == 0 && mi.rcMonitor.Right != 0 && mi.rcMonitor.Bottom != 0)
-        {
-            // Primary screen
-            _ = Interlocked.Exchange(ref Common.screenWidth, mi.rcMonitor.Right - mi.rcMonitor.Left);
-            _ = Interlocked.Exchange(ref Common.screenHeight, mi.rcMonitor.Bottom - mi.rcMonitor.Top);
-
-            newPrimaryScreenBounds.Left = mi.rcMonitor.Left;
-            newPrimaryScreenBounds.Top = mi.rcMonitor.Top;
-            newPrimaryScreenBounds.Right = mi.rcMonitor.Right;
-            newPrimaryScreenBounds.Bottom = mi.rcMonitor.Bottom;
-        }
-        else
-        {
-            if (mi.rcMonitor.Left < newDesktopBounds.Left)
-            {
-                newDesktopBounds.Left = mi.rcMonitor.Left;
-            }
-
-            if (mi.rcMonitor.Top < newDesktopBounds.Top)
-            {
-                newDesktopBounds.Top = mi.rcMonitor.Top;
-            }
-
-            if (mi.rcMonitor.Right > newDesktopBounds.Right)
-            {
-                newDesktopBounds.Right = mi.rcMonitor.Right;
-            }
-
-            if (mi.rcMonitor.Bottom > newDesktopBounds.Bottom)
-            {
-                newDesktopBounds.Bottom = mi.rcMonitor.Bottom;
-            }
-        }
-
-        lock (SensitivePoints)
-        {
-            SensitivePoints.Add(new Point(mi.rcMonitor.Left, mi.rcMonitor.Top));
-            SensitivePoints.Add(new Point(mi.rcMonitor.Right, mi.rcMonitor.Top));
-            SensitivePoints.Add(new Point(mi.rcMonitor.Right, mi.rcMonitor.Bottom));
-            SensitivePoints.Add(new Point(mi.rcMonitor.Left, mi.rcMonitor.Bottom));
-        }
-
-        return true;
-    }
-
-    internal static void GetScreenConfig()
-    {
-        try
-        {
-            Logger.LogDebug("==================== GetScreenConfig started");
-            newDesktopBounds = new MyRectangle();
-            newPrimaryScreenBounds = new MyRectangle();
-            newDesktopBounds.Left = newPrimaryScreenBounds.Left = Screen.PrimaryScreen.Bounds.Left;
-            newDesktopBounds.Top = newPrimaryScreenBounds.Top = Screen.PrimaryScreen.Bounds.Top;
-            newDesktopBounds.Right = newPrimaryScreenBounds.Right = Screen.PrimaryScreen.Bounds.Right;
-            newDesktopBounds.Bottom = newPrimaryScreenBounds.Bottom = Screen.PrimaryScreen.Bounds.Bottom;
-
-            Logger.Log(string.Format(
-                CultureInfo.CurrentCulture,
-                "logon = {0} PrimaryScreenBounds = {1},{2},{3},{4} desktopBounds = {5},{6},{7},{8}",
-                Common.RunOnLogonDesktop,
-                WinAPI.newPrimaryScreenBounds.Left,
-                WinAPI.newPrimaryScreenBounds.Top,
-                WinAPI.newPrimaryScreenBounds.Right,
-                WinAPI.newPrimaryScreenBounds.Bottom,
-                WinAPI.newDesktopBounds.Left,
-                WinAPI.newDesktopBounds.Top,
-                WinAPI.newDesktopBounds.Right,
-                WinAPI.newDesktopBounds.Bottom));
-
-#if USE_MANAGED_ROUTINES
-            // Managed routines do not work well when running on secure desktop:(
-            screenWidth = Screen.PrimaryScreen.Bounds.Width;
-            screenHeight = Screen.PrimaryScreen.Bounds.Height;
-            screenCount = Screen.AllScreens.Length;
-            for (int i = 0; i < Screen.AllScreens.Length; i++)
-            {
-                if (Screen.AllScreens[i].Bounds.Left < desktopBounds.Left) desktopBounds.Left = Screen.AllScreens[i].Bounds.Left;
-                if (Screen.AllScreens[i].Bounds.Top < desktopBounds.Top) desktopBounds.Top = Screen.AllScreens[i].Bounds.Top;
-                if (Screen.AllScreens[i].Bounds.Right > desktopBounds.Right) desktopBounds.Right = Screen.AllScreens[i].Bounds.Right;
-                if (Screen.AllScreens[i].Bounds.Bottom > desktopBounds.Bottom) desktopBounds.Bottom = Screen.AllScreens[i].Bounds.Bottom;
-            }
-#else
-            lock (SensitivePoints)
-            {
-                SensitivePoints.Clear();
-            }
-
-            NativeMethods.EnumDisplayMonitors(IntPtr.Zero, IntPtr.Zero, MonitorEnumProc, IntPtr.Zero);
-
-            // 1000 calls to EnumDisplayMonitors cost a dozen of milliseconds
-#endif
-            Interlocked.Exchange(ref MachineStuff.desktopBounds, newDesktopBounds);
-            Interlocked.Exchange(ref MachineStuff.primaryScreenBounds, newPrimaryScreenBounds);
-
-            Logger.Log(string.Format(
-                CultureInfo.CurrentCulture,
-                "logon = {0} PrimaryScreenBounds = {1},{2},{3},{4} desktopBounds = {5},{6},{7},{8}",
-                Common.RunOnLogonDesktop,
-                MachineStuff.PrimaryScreenBounds.Left,
-                MachineStuff.PrimaryScreenBounds.Top,
-                MachineStuff.PrimaryScreenBounds.Right,
-                MachineStuff.PrimaryScreenBounds.Bottom,
-                MachineStuff.DesktopBounds.Left,
-                MachineStuff.DesktopBounds.Top,
-                MachineStuff.DesktopBounds.Right,
-                MachineStuff.DesktopBounds.Bottom));
-
-            Logger.Log("==================== GetScreenConfig ended");
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-#if USING_SCREEN_SAVER_ROUTINES
-            [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern int PostMessage(IntPtr hWnd, int wMsg, int wParam, int lParam);
-
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern IntPtr OpenDesktop(string hDesktop, int Flags, bool Inherit, UInt32 DesiredAccess);
-
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern bool CloseDesktop(IntPtr hDesktop);
-
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern bool EnumDesktopWindows( IntPtr hDesktop, EnumDesktopWindowsProc callback, IntPtr lParam);
-
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern bool IsWindowVisible(IntPtr hWnd);
-
-    [DllImport("user32.dll", CharSet = CharSet.Auto)]
-    private static extern bool SystemParametersInfo(int uAction, int uParam, ref int pvParam, int flags);
-
-    private delegate bool EnumDesktopWindowsProc(IntPtr hDesktop, IntPtr lParam);
-    private const int WM_CLOSE = 16;
-    private const int SPI_GETSCREENSAVERRUNNING = 114;
-
-    internal static bool IsScreenSaverRunning()
-    {
-        int isRunning = 0;
-        SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0,ref isRunning, 0);
-        return (isRunning != 0);
-    }
-
-    internal static void CloseScreenSaver()
-    {
-        IntPtr hDesktop = OpenDesktop("Screen-saver", 0, false, DESKTOP_READOBJECTS | DESKTOP_WRITEOBJECTS);
-        if (hDesktop != IntPtr.Zero)
-        {
-            LogDebug("Closing screen saver...");
-            EnumDesktopWindows(hDesktop, new EnumDesktopWindowsProc(CloseScreenSaverFunc), IntPtr.Zero);
-            CloseDesktop(hDesktop);
-        }
-    }
-
-    private static bool CloseScreenSaverFunc(IntPtr hWnd, IntPtr lParam)
-    {
-        if (IsWindowVisible(hWnd))
-        {
-            LogDebug("Posting WM_CLOSE to " + hWnd.ToString(CultureInfo.InvariantCulture));
-            PostMessage(hWnd, WM_CLOSE, 0, 0);
-        }
-        return true;
-    }
-#endif
-
-    internal static string GetMyDesktop()
-    {
-        byte[] arThreadDesktop = new byte[256];
-        IntPtr hD = NativeMethods.GetThreadDesktop(NativeMethods.GetCurrentThreadId());
-        if (hD != IntPtr.Zero)
-        {
-            _ = NativeMethods.GetUserObjectInformation(hD, NativeMethods.UOI_NAME, arThreadDesktop, arThreadDesktop.Length, out _);
-            return Common.GetString(arThreadDesktop).Replace("\0", string.Empty);
-        }
-
-        return string.Empty;
-    }
-
-    internal static string GetInputDesktop()
-    {
-        byte[] arInputDesktop = new byte[256];
-        IntPtr hD = NativeMethods.OpenInputDesktop(0, false, NativeMethods.DESKTOP_READOBJECTS);
-        if (hD != IntPtr.Zero)
-        {
-            _ = NativeMethods.GetUserObjectInformation(hD, NativeMethods.UOI_NAME, arInputDesktop, arInputDesktop.Length, out _);
-            return Common.GetString(arInputDesktop).Replace("\0", string.Empty);
-        }
-
-        return string.Empty;
-    }
-
-    private static void StartMMService(string desktopToRunMouseWithoutBordersOn)
-    {
-        if (!Common.RunWithNoAdminRight)
-        {
-            Logger.LogDebug("*** Starting on active Desktop: " + desktopToRunMouseWithoutBordersOn);
-            Service.StartMouseWithoutBordersService(desktopToRunMouseWithoutBordersOn);
-        }
-    }
-
-    internal static void CheckForDesktopSwitchEvent(bool cleanupIfExit)
-    {
-        try
-        {
-            if (!IsMyDesktopActive() || Common.CurrentProcess.SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
-            {
-                Helper.RunDDHelper(true);
-                int waitCount = 20;
-
-                while (NativeMethods.WTSGetActiveConsoleSessionId() == 0xFFFFFFFF && waitCount > 0)
-                {
-                    waitCount--;
-                    Logger.LogDebug("The session is detached/attached.");
-                    Thread.Sleep(500);
-                }
-
-                string myDesktop = GetMyDesktop();
-                activeDesktop = GetInputDesktop();
-
-                Logger.LogDebug("*** Active Desktop = " + activeDesktop);
-                Logger.LogDebug("*** My Desktop = " + myDesktop);
-
-                if (myDesktop.Equals(activeDesktop, StringComparison.OrdinalIgnoreCase))
-                {
-                    Logger.LogDebug("*** Active Desktop == My Desktop (TS session)");
-                }
-
-                if (!activeDesktop.Equals("winlogon", StringComparison.OrdinalIgnoreCase) &&
-                    !activeDesktop.Equals("default", StringComparison.OrdinalIgnoreCase) &&
-                    !activeDesktop.Equals("disconnect", StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        StartMMService(activeDesktop);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Log($"{nameof(CheckForDesktopSwitchEvent)}: {e}");
-                    }
-                }
-                else
-                {
-                    if (!myDesktop.Equals(activeDesktop, StringComparison.OrdinalIgnoreCase))
-                    {
-                        Logger.Log("*** Active Desktop <> My Desktop");
-                    }
-
-                    uint sid = NativeMethods.WTSGetActiveConsoleSessionId();
-
-                    if (Process.GetProcessesByName(Common.BinaryName).Any(p => (uint)p.SessionId == sid))
-                    {
-                        Logger.Log("Found MouseWithoutBorders on the active session!");
-                    }
-                    else
-                    {
-                        Logger.Log("MouseWithoutBorders not found on the active session!");
-                        StartMMService(null);
-                    }
-                }
-
-                if (!myDesktop.Equals("winlogon", StringComparison.OrdinalIgnoreCase) &&
-                    !myDesktop.Equals("default", StringComparison.OrdinalIgnoreCase))
-                {
-                    Logger.LogDebug("*** Desktop inactive, exiting: " + myDesktop);
-                    Setting.Values.LastX = Common.JUST_GOT_BACK_FROM_SCREEN_SAVER;
-                    if (cleanupIfExit)
-                    {
-                        InitAndCleanup.Cleanup();
-                    }
-
-                    Process.GetCurrentProcess().KillProcess();
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            Logger.Log(e);
-        }
-    }
-
-    private static Point p;
-
-    internal static bool IsMyDesktopActive()
-    {
-        return NativeMethods.GetCursorPos(ref p);
-    }
-}

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

@@ -42,7 +42,7 @@ namespace MouseWithoutBorders
 
         protected string GetSecureKey()
         {
-            return Encryption.MyKey;
+            return Common.MyKey;
         }
 
         private void BackButton_Click(object sender, EventArgs e)

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

@@ -89,8 +89,8 @@ namespace MouseWithoutBorders
         {
             if (GetSecureKey() != SecurityCodeField.Text)
             {
-                Encryption.MyKey = Regex.Replace(SecurityCodeField.Text, @"\s+", string.Empty);
-                SecurityCode = Encryption.MyKey;
+                Common.MyKey = Regex.Replace(SecurityCodeField.Text, @"\s+", string.Empty);
+                SecurityCode = Common.MyKey;
             }
 
             MachineStuff.MachineMatrix = new string[MachineStuff.MAX_MACHINE] { ComputerNameField.Text.Trim().ToUpper(CultureInfo.CurrentCulture), Common.MachineName.Trim(), string.Empty, string.Empty };

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

@@ -135,7 +135,7 @@ namespace MouseWithoutBorders
         internal void UpdateKeyTextBox()
         {
             _ = Helper.GetUserName();
-            textBoxEnc.Text = Encryption.MyKey;
+            textBoxEnc.Text = Common.MyKey;
         }
 
         private void InitAll()
@@ -505,19 +505,19 @@ namespace MouseWithoutBorders
 
         private bool UpdateKey(string newKey)
         {
-            if (!Encryption.IsKeyValid(newKey, out string rv))
+            if (!Common.IsKeyValid(newKey, out string rv))
             {
                 ShowKeyErrorMsg(rv);
                 return false;
             }
 
-            if (!newKey.Equals(Encryption.MyKey, StringComparison.OrdinalIgnoreCase))
+            if (!newKey.Equals(Common.MyKey, StringComparison.OrdinalIgnoreCase))
             {
-                Encryption.MyKey = newKey;
-                Encryption.GeneratedKey = false;
+                Common.MyKey = newKey;
+                Common.GeneratedKey = false;
             }
 
-            Encryption.MagicNumber = Encryption.Get24BitHash(Encryption.MyKey);
+            Common.MagicNumber = Common.Get24BitHash(Common.MyKey);
             return true;
         }
 
@@ -1116,10 +1116,10 @@ namespace MouseWithoutBorders
 
             if (MessageBox.Show(message, Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
             {
-                Setting.Values.MyKey = Encryption.MyKey = Encryption.CreateRandomKey();
-                textBoxEnc.Text = Encryption.MyKey;
+                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+                textBoxEnc.Text = Common.MyKey;
                 checkBoxShowKey.Checked = true;
-                Encryption.GeneratedKey = true;
+                Common.GeneratedKey = true;
                 ButtonOK_Click(null, null);
                 Common.ShowToolTip("New security key was generated, update other machines to the same key.", 10000, ToolTipIcon.Info, false);
             }

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

@@ -318,7 +318,7 @@ namespace MouseWithoutBorders
 
             try
             {
-                if (!WinAPI.IsMyDesktopActive() || Common.CurrentProcess.SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
+                if (!Common.IsMyDesktopActive() || Common.CurrentProcess.SessionId != NativeMethods.WTSGetActiveConsoleSessionId())
                 {
                     myDesktopNotActive = true;
 
@@ -348,7 +348,7 @@ namespace MouseWithoutBorders
                             Common.Hook?.ResetLastSwitchKeys();
                         });
 
-                        WinAPI.CheckForDesktopSwitchEvent(true);
+                        Common.CheckForDesktopSwitchEvent(true);
                     }
                 }
                 else
@@ -369,21 +369,21 @@ namespace MouseWithoutBorders
                             if (myDesktopNotActive)
                             {
                                 myDesktopNotActive = false;
-                                Encryption.MyKey = Setting.Values.MyKey;
+                                Common.MyKey = Setting.Values.MyKey;
                             }
 
                             MachineStuff.UpdateMachinePoolStringSetting();
 
-                            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && (Setting.Values.FirstRun || Encryption.KeyCorrupted))
+                            if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && (Setting.Values.FirstRun || Common.KeyCorrupted))
                             {
                                 if (!shownSetupFormOneTime)
                                 {
                                     shownSetupFormOneTime = true;
                                     MachineStuff.ShowMachineMatrix();
 
-                                    if (Encryption.KeyCorrupted && !Setting.Values.FirstRun)
+                                    if (Common.KeyCorrupted && !Setting.Values.FirstRun)
                                     {
-                                        Encryption.KeyCorrupted = false;
+                                        Common.KeyCorrupted = false;
                                         string msg = "The security key is corrupted for some reason, please re-setup.";
                                         MessageBox.Show(msg, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
                                     }
@@ -490,9 +490,9 @@ namespace MouseWithoutBorders
 
                     if (count == 600)
                     {
-                        if (!Encryption.GeneratedKey)
+                        if (!Common.GeneratedKey)
                         {
-                            Encryption.MyKey = Setting.Values.MyKey;
+                            Common.MyKey = Setting.Values.MyKey;
 
                             if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                             {
@@ -505,7 +505,7 @@ namespace MouseWithoutBorders
                                 Common.ShowToolTip("The security key must be auto generated in one of the machines.", 10000);
                             }
                         }
-                        else if (!Encryption.KeyCorrupted && !Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && !Setting.Values.FirstRun && Common.AtLeastOneSocketConnected())
+                        else if (!Common.KeyCorrupted && !Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && !Setting.Values.FirstRun && Common.AtLeastOneSocketConnected())
                         {
                             int myKeyDaysToExpire = Setting.Values.MyKeyDaysToExpire;
 
@@ -531,7 +531,7 @@ namespace MouseWithoutBorders
 #if SHOW_ON_WINLOGON
                     // if (Common.RunOnLogonDesktop) ShowMouseWithoutBordersUiOnWinLogonDesktop(false);
 #endif
-                    WinAPI.CheckForDesktopSwitchEvent(true);
+                    Common.CheckForDesktopSwitchEvent(true);
                     MachineStuff.UpdateClientSockets("helperTimer_Tick"); // Sockets may be closed by the remote host when both machines switch desktop at the same time.
                 }
 
@@ -582,7 +582,7 @@ namespace MouseWithoutBorders
 
                         int rv = 0;
 
-                        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && WinAPI.IsMyDesktopActive() && (rv = Helper.SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero)) <= 0)
+                        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop && Common.IsMyDesktopActive() && (rv = Helper.SendMessageToHelper(0x400, IntPtr.Zero, IntPtr.Zero)) <= 0)
                         {
                             Logger.TelemetryLogTrace($"{Helper.HELPER_FORM_TEXT} not found: {rv}", SeverityLevel.Warning);
                         }

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

@@ -46,6 +46,79 @@ avgSendTime = 0
 maxSendTime = 0
 totalSendCount = 0
 totalSendTime = 0
+magicNumber = 0
+ran = System.Random
+--_impl = System.Random+XoshiroImpl
+----_s0 = ????????????
+----_s1 = ????????????
+----_s2 = ????????????
+----_s3 = ????????????
+--<Shared>k__BackingField = System.Random+ThreadSafeRandom
+InitialIV = ????????????
+<GeneratedKey>k__BackingField = False
+<KeyCorrupted>k__BackingField = False
+LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte[]]
+--_tables = Concurrent.ConcurrentDictionary`2+Tables[System.String,System.Byte[]]
+----_comparer = Generic.NonRandomizedStringEqualityComparer+OrdinalIgnoreCaseComparer
+----_buckets = Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][]
+------System.Collections.Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][] = Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][]: N/A
+----_fastModBucketsMultiplier = 498560650640798693
+----_locks = O[]
+------System.Object[] = O[]: N/A
+----_countPerLock = 32[]
+------[0] = 0
+------[1] = 0
+------[2] = 0
+------[3] = 0
+------[4] = 0
+------[5] = 0
+------[6] = 0
+------[7] = 0
+--_budget = ????????????
+--_growLockArray = True
+--_comparerIsDefaultForClasses = False
+PackageSent = MouseWithoutBorders.PackageMonitor
+--Keyboard = 0
+--Mouse = 0
+--Heartbeat = 0
+--ByeBye = 0
+--Hello = 0
+--Matrix = 0
+--ClipboardText = 0
+--ClipboardImage = 0
+--Clipboard = 0
+--ClipboardDragDrop = 0
+--ClipboardDragDropEnd = 0
+--ClipboardAsk = 0
+--ExplorerDragDrop = 0
+--Nil = 0
+PackageReceived = MouseWithoutBorders.PackageMonitor
+--Keyboard = 0
+--Mouse = 0
+--Heartbeat = 0
+--ByeBye = 0
+--Hello = 0
+--Matrix = 0
+--ClipboardText = 0
+--ClipboardImage = 0
+--Clipboard = 0
+--ClipboardDragDrop = 0
+--ClipboardDragDropEnd = 0
+--ClipboardAsk = 0
+--ExplorerDragDrop = 0
+--Nil = 0
+PackageID = 0
+SensitivePoints = Generic.List`1[Point]
+--_items = Point[]
+----System.Drawing.Point[] = Point[]: N/A
+--_size = 0
+--_version = 0
+--s_emptyArray = Point[]
+----System.Drawing.Point[] = Point[]: N/A
+p = {X=0,Y=0}
+--x = 0
+--y = 0
+--Empty = {X=0,Y=0}
 <IpcChannelCreated>k__BackingField = False
 TOGGLE_ICONS_SIZE = 4
 ICON_ONE = 0
@@ -55,6 +128,34 @@ ICON_BIG_CLIPBOARD = 3
 ICON_ERROR = 4
 JUST_GOT_BACK_FROM_SCREEN_SAVER = 9999
 NETWORK_STREAM_BUF_SIZE = 1048576
+SymAlBlockSize = 16
+PW_LENGTH = 16
+PACKAGE_SIZE = 32
+PACKAGE_SIZE_EX = 64
+WP_PACKAGE_SIZE = 6
+KEYEVENTF_KEYDOWN = 1
+KEYEVENTF_KEYUP = 2
+WH_MOUSE = 7
+WH_KEYBOARD = 2
+WH_MOUSE_LL = 14
+WH_KEYBOARD_LL = 13
+WM_MOUSEMOVE = 512
+WM_LBUTTONDOWN = 513
+WM_RBUTTONDOWN = 516
+WM_MBUTTONDOWN = 519
+WM_XBUTTONDOWN = 523
+WM_LBUTTONUP = 514
+WM_RBUTTONUP = 517
+WM_MBUTTONUP = 520
+WM_XBUTTONUP = 524
+WM_LBUTTONDBLCLK = 515
+WM_RBUTTONDBLCLK = 518
+WM_MBUTTONDBLCLK = 521
+WM_MOUSEWHEEL = 522
+WM_KEYDOWN = 256
+WM_KEYUP = 257
+WM_SYSKEYDOWN = 260
+WM_SYSKEYUP = 261
 [Clipboard]
 ===============
 Comma = System.Char[]
@@ -92,51 +193,16 @@ dragDropStep05ExCalledByIpc = 0
 isDropping = False
 dragMachine = NONE
 <MouseDown>k__BackingField = False
-[Encryption]
-===============
-magicNumber = 0
-ran = System.Random
---_impl = System.Random+XoshiroImpl
-----_s0 = ????????????
-----_s1 = ????????????
-----_s2 = ????????????
-----_s3 = ????????????
---<Shared>k__BackingField = System.Random+ThreadSafeRandom
-InitialIV = ????????????
-<GeneratedKey>k__BackingField = False
-<KeyCorrupted>k__BackingField = False
-LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte[]]
---_tables = Concurrent.ConcurrentDictionary`2+Tables[System.String,System.Byte[]]
-----_comparer = Generic.NonRandomizedStringEqualityComparer+OrdinalIgnoreCaseComparer
-----_buckets = Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][]
-------System.Collections.Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][] = Concurrent.ConcurrentDictionary`2+VolatileNode[System.String,System.Byte[]][]: N/A
-----_fastModBucketsMultiplier = 498560650640798693
-----_locks = O[]
-------System.Object[] = O[]: N/A
-----_countPerLock = 32[]
-------[0] = 0
-------[1] = 0
-------[2] = 0
-------[3] = 0
-------[4] = 0
-------[5] = 0
-------[6] = 0
-------[7] = 0
---_budget = ????????????
---_growLockArray = True
---_comparerIsDefaultForClasses = False
-SymAlBlockSize = 16
-PW_LENGTH = 16
 [Event]
 ===============
-KeybdPackage = MouseWithoutBorders.Core.DATA
+KeybdPackage = MouseWithoutBorders.DATA
 --Type = 0
 --Id = 0
 --Src = NONE
 --Des = NONE
 --DateTime = 0
---Kd = MouseWithoutBorders.Core.KEYBDDATA
---Md = MouseWithoutBorders.Core.MOUSEDATA
+--Kd = MouseWithoutBorders.KEYBDDATA
+--Md = MouseWithoutBorders.MOUSEDATA
 --Machine1 = NONE
 --Machine2 = NONE
 --Machine3 = NONE
@@ -146,14 +212,14 @@ KeybdPackage = MouseWithoutBorders.Core.DATA
 --machineNameP2 = 0
 --machineNameP3 = 0
 --machineNameP4 = 0
-MousePackage = MouseWithoutBorders.Core.DATA
+MousePackage = MouseWithoutBorders.DATA
 --Type = 0
 --Id = 0
 --Src = NONE
 --Des = NONE
 --DateTime = 0
---Kd = MouseWithoutBorders.Core.KEYBDDATA
---Md = MouseWithoutBorders.Core.MOUSEDATA
+--Kd = MouseWithoutBorders.KEYBDDATA
+--Md = MouseWithoutBorders.MOUSEDATA
 --Machine1 = NONE
 --Machine2 = NONE
 --Machine3 = NONE
@@ -230,7 +296,7 @@ LogCounter = Concurrent.ConcurrentDictionary`2[System.String,32]
 allLogsIndex = 0
 lastHour = 0
 exceptionCount = 0
-lastPackageSent = MouseWithoutBorders.Core.PackageMonitor
+lastPackageSent = MouseWithoutBorders.PackageMonitor
 --Keyboard = 0
 --Mouse = 0
 --Heartbeat = 0
@@ -245,7 +311,7 @@ lastPackageSent = MouseWithoutBorders.Core.PackageMonitor
 --ClipboardAsk = 0
 --ExplorerDragDrop = 0
 --Nil = 0
-lastPackageReceived = MouseWithoutBorders.Core.PackageMonitor
+lastPackageReceived = MouseWithoutBorders.PackageMonitor
 --Keyboard = 0
 --Mouse = 0
 --Heartbeat = 0
@@ -300,42 +366,6 @@ MAX_SOCKET = 8
 HEARTBEAT_TIMEOUT = 1500000
 SKIP_PIXELS = 1
 JUMP_PIXELS = 2
-[Package]
-===============
-PackageSent = MouseWithoutBorders.Core.PackageMonitor
---Keyboard = 0
---Mouse = 0
---Heartbeat = 0
---ByeBye = 0
---Hello = 0
---Matrix = 0
---ClipboardText = 0
---ClipboardImage = 0
---Clipboard = 0
---ClipboardDragDrop = 0
---ClipboardDragDropEnd = 0
---ClipboardAsk = 0
---ExplorerDragDrop = 0
---Nil = 0
-PackageReceived = MouseWithoutBorders.Core.PackageMonitor
---Keyboard = 0
---Mouse = 0
---Heartbeat = 0
---ByeBye = 0
---Hello = 0
---Matrix = 0
---ClipboardText = 0
---ClipboardImage = 0
---Clipboard = 0
---ClipboardDragDrop = 0
---ClipboardDragDropEnd = 0
---ClipboardAsk = 0
---ExplorerDragDrop = 0
---Nil = 0
-PackageID = 0
-PACKAGE_SIZE = 32
-PACKAGE_SIZE_EX = 64
-WP_PACKAGE_SIZE = 6
 [Receiver]
 ===============
 QUEUE_SIZE = 50
@@ -406,41 +436,3 @@ lastStartServiceTime = ????????????
 --MinValue = 01/01/0001 00:00:00
 --MaxValue = 31/12/9999 23:59:59
 --UnixEpoch = 01/01/1970 00:00:00
-[WinAPI]
-===============
-SensitivePoints = Generic.List`1[Point]
---_items = Point[]
-----System.Drawing.Point[] = Point[]: N/A
---_size = 0
---_version = 0
---s_emptyArray = Point[]
-----System.Drawing.Point[] = Point[]: N/A
-p = {X=0,Y=0}
---x = 0
---y = 0
---Empty = {X=0,Y=0}
-[WM]
-===============
-KEYEVENTF_KEYDOWN = 1
-KEYEVENTF_KEYUP = 2
-WH_MOUSE = 7
-WH_KEYBOARD = 2
-WH_MOUSE_LL = 14
-WH_KEYBOARD_LL = 13
-WM_MOUSEMOVE = 512
-WM_LBUTTONDOWN = 513
-WM_RBUTTONDOWN = 516
-WM_MBUTTONDOWN = 519
-WM_XBUTTONDOWN = 523
-WM_LBUTTONUP = 514
-WM_RBUTTONUP = 517
-WM_MBUTTONUP = 520
-WM_XBUTTONUP = 524
-WM_LBUTTONDBLCLK = 515
-WM_RBUTTONDBLCLK = 518
-WM_MBUTTONDBLCLK = 521
-WM_MOUSEWHEEL = 522
-WM_KEYDOWN = 256
-WM_KEYUP = 257
-WM_SYSKEYDOWN = 260
-WM_SYSKEYUP = 261

src/modules/ZoomIt/ZoomIt/ZoomIt.rc

@@ -121,7 +121,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.21",IDC_VERSION,42,7,73,10
+    LTEXT           "ZoomIt v9.20",IDC_VERSION,42,7,73,10
     LTEXT           "Copyright © 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
     CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                     "SysLink",WS_TABSTOP,42,26,150,9

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs

@@ -11,15 +11,15 @@ public class GalleryGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<IGalleryGridLayout> _model;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle { get; private set; }
-
     public GalleryGridPropertiesViewModel(IGalleryGridLayout galleryGridLayout)
     {
         _model = new(galleryGridLayout);
     }
 
+    public bool ShowTitle { get; set; }
+
+    public bool ShowSubtitle { get; set; }
+
     public void InitializeProperties()
     {
         var model = _model.Unsafe;

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs

@@ -6,9 +6,5 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 
 public interface IGridPropertiesViewModel
 {
-    bool ShowTitle { get; }
-
-    bool ShowSubtitle { get; }
-
     void InitializeProperties();
 }

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs

@@ -10,9 +10,10 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public partial class ListItemViewModel : CommandItemViewModel
+public partial class ListItemViewModel(IListItem model, WeakReference<IPageContext> context)
+    : CommandItemViewModel(new(model), context)
 {
-    public new ExtensionObject<IListItem> Model { get; }
+    public new ExtensionObject<IListItem> Model { get; } = new(model);
 
     public List<TagViewModel>? Tags { get; set; }
 
@@ -31,40 +32,6 @@ public partial class ListItemViewModel : CommandItemViewModel
 
     public string AccessibleName { get; private set; } = string.Empty;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle { get; private set; }
-
-    public bool LayoutShowsTitle
-    {
-        get;
-        set
-        {
-            if (SetProperty(ref field, value))
-            {
-                UpdateShowsTitle();
-            }
-        }
-    }
-
-    public bool LayoutShowsSubtitle
-    {
-        get;
-        set
-        {
-            if (SetProperty(ref field, value))
-            {
-                UpdateShowsSubtitle();
-            }
-        }
-    }
-
-    public ListItemViewModel(IListItem model, WeakReference<IPageContext> context)
-        : base(new(model), context)
-    {
-        Model = new ExtensionObject<IListItem>(model);
-    }
-
     public override void InitializeProperties()
     {
         if (IsInitialized)
@@ -126,18 +93,16 @@ public partial class ListItemViewModel : CommandItemViewModel
 
         switch (propertyName)
         {
-            case nameof(model.Tags):
+            case nameof(Tags):
                 UpdateTags(model.Tags);
                 break;
-            case nameof(model.TextToSuggest):
-                TextToSuggest = model.TextToSuggest ?? string.Empty;
-                UpdateProperty(nameof(TextToSuggest));
+            case nameof(TextToSuggest):
+                this.TextToSuggest = model.TextToSuggest ?? string.Empty;
                 break;
-            case nameof(model.Section):
-                Section = model.Section ?? string.Empty;
-                UpdateProperty(nameof(Section));
+            case nameof(Section):
+                this.Section = model.Section ?? string.Empty;
                 break;
-            case nameof(model.Details):
+            case nameof(Details):
                 var extensionDetails = model.Details;
                 Details = extensionDetails is not null ? new(extensionDetails, PageContext) : null;
                 Details?.InitializeProperties();
@@ -145,24 +110,16 @@ public partial class ListItemViewModel : CommandItemViewModel
                 UpdateProperty(nameof(HasDetails));
                 UpdateShowDetailsCommand();
                 break;
-            case nameof(model.MoreCommands):
-                UpdateProperty(nameof(MoreCommands));
+            case nameof(MoreCommands):
                 AddShowDetailsCommands();
                 break;
-            case nameof(model.Title):
-                UpdateProperty(nameof(Title));
-                UpdateShowsTitle();
+            case nameof(Title):
+            case nameof(Subtitle):
                 UpdateAccessibleName();
                 break;
-            case nameof(model.Subtitle):
-                UpdateProperty(nameof(Subtitle));
-                UpdateShowsSubtitle();
-                UpdateAccessibleName();
-                break;
-            default:
-                UpdateProperty(propertyName);
-                break;
         }
+
+        UpdateProperty(propertyName);
     }
 
     // TODO: Do we want filters to match descriptions and other properties? Tags, etc... Yes?
@@ -249,32 +206,11 @@ public partial class ListItemViewModel : CommandItemViewModel
                 // many COM exception issues.
                 Tags = [.. newTags];
 
-                // We're already in UI thread, so just raise the events
-                OnPropertyChanged(nameof(Tags));
-                OnPropertyChanged(nameof(HasTags));
+                UpdateProperty(nameof(Tags));
+                UpdateProperty(nameof(HasTags));
             });
     }
 
-    private void UpdateShowsTitle()
-    {
-        var oldShowTitle = ShowTitle;
-        ShowTitle = LayoutShowsTitle;
-        if (oldShowTitle != ShowTitle)
-        {
-            UpdateProperty(nameof(ShowTitle));
-        }
-    }
-
-    private void UpdateShowsSubtitle()
-    {
-        var oldShowSubtitle = ShowSubtitle;
-        ShowSubtitle = LayoutShowsSubtitle && !string.IsNullOrWhiteSpace(Subtitle);
-        if (oldShowSubtitle != ShowSubtitle)
-        {
-            UpdateProperty(nameof(ShowSubtitle));
-        }
-    }
-
     protected override void UnsafeCleanup()
     {
         base.UnsafeCleanup();

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs

@@ -24,7 +24,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     // Observable from MVVM Toolkit will auto create public properties that use INotifyPropertyChange change
     // https://learn.microsoft.com/dotnet/communitytoolkit/mvvm/observablegroupedcollections for grouping support
-    public ObservableCollection<ListItemViewModel> FilteredItems { get; } = [];
+    [ObservableProperty]
+    public partial ObservableCollection<ListItemViewModel> FilteredItems { get; set; } = [];
 
     public FiltersViewModel? Filters { get; set; }
 
@@ -223,8 +224,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // TODO we can probably further optimize this by also keeping a
             // HashSet of every ExtensionObject we currently have, and only
             // building new viewmodels for the ones we haven't already built.
-            var showsTitle = GridProperties?.ShowTitle ?? true;
-            var showsSubtitle = GridProperties?.ShowSubtitle ?? true;
             foreach (var item in newItems)
             {
                 // Check for cancellation during item processing
@@ -238,8 +237,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 // If an item fails to load, silently ignore it.
                 if (viewModel.SafeFastInit())
                 {
-                    viewModel.LayoutShowsTitle = showsTitle;
-                    viewModel.LayoutShowsSubtitle = showsSubtitle;
                     newViewModels.Add(viewModel);
                 }
             }
@@ -586,7 +583,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
         GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
         GridProperties?.InitializeProperties();
         UpdateProperty(nameof(GridProperties));
-        ApplyLayoutToItems();
 
         ShowDetails = model.ShowDetails;
         UpdateProperty(nameof(ShowDetails));
@@ -612,15 +608,22 @@ public partial class ListViewModel : PageViewModel, IDisposable
         model.ItemsChanged += Model_ItemsChanged;
     }
 
-    private static IGridPropertiesViewModel? LoadGridPropertiesViewModel(IGridProperties? gridProperties)
+    private IGridPropertiesViewModel? LoadGridPropertiesViewModel(IGridProperties? gridProperties)
     {
-        return gridProperties switch
+        if (gridProperties is IMediumGridLayout mediumGridLayout)
         {
-            IMediumGridLayout mediumGridLayout => new MediumGridPropertiesViewModel(mediumGridLayout),
-            IGalleryGridLayout galleryGridLayout => new GalleryGridPropertiesViewModel(galleryGridLayout),
-            ISmallGridLayout smallGridLayout => new SmallGridPropertiesViewModel(smallGridLayout),
-            _ => null,
-        };
+            return new MediumGridPropertiesViewModel(mediumGridLayout);
+        }
+        else if (gridProperties is IGalleryGridLayout galleryGridLayout)
+        {
+            return new GalleryGridPropertiesViewModel(galleryGridLayout);
+        }
+        else if (gridProperties is ISmallGridLayout smallGridLayout)
+        {
+            return new SmallGridPropertiesViewModel(smallGridLayout);
+        }
+
+        return null;
     }
 
     public void LoadMoreIfNeeded()
@@ -682,7 +685,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 GridProperties = LoadGridPropertiesViewModel(model.GridProperties);
                 GridProperties?.InitializeProperties();
                 UpdateProperty(nameof(IsGridView));
-                ApplyLayoutToItems();
                 break;
             case nameof(ShowDetails):
                 ShowDetails = model.ShowDetails;
@@ -728,21 +730,6 @@ public partial class ListViewModel : PageViewModel, IDisposable
            });
     }
 
-    private void ApplyLayoutToItems()
-    {
-        lock (_listLock)
-        {
-            var showsTitle = GridProperties?.ShowTitle ?? true;
-            var showsSubtitle = GridProperties?.ShowSubtitle ?? true;
-
-            foreach (var item in Items)
-            {
-                item.LayoutShowsTitle = showsTitle;
-                item.LayoutShowsSubtitle = showsSubtitle;
-            }
-        }
-    }
-
     public void Dispose()
     {
         GC.SuppressFinalize(this);

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs

@@ -11,15 +11,13 @@ public class MediumGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<IMediumGridLayout> _model;
 
-    public bool ShowTitle { get; private set; }
-
-    public bool ShowSubtitle => false;
-
     public MediumGridPropertiesViewModel(IMediumGridLayout mediumGridLayout)
     {
         _model = new(mediumGridLayout);
     }
 
+    public bool ShowTitle { get; set; }
+
     public void InitializeProperties()
     {
         var model = _model.Unsafe;

src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs

@@ -11,10 +11,6 @@ public class SmallGridPropertiesViewModel : IGridPropertiesViewModel
 {
     private readonly ExtensionObject<ISmallGridLayout> _model;
 
-    public bool ShowTitle => false;
-
-    public bool ShowSubtitle => false;
-
     public SmallGridPropertiesViewModel(ISmallGridLayout smallGridLayout)
     {
         _model = new(smallGridLayout);

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -36,7 +36,6 @@ public partial class MainListPage : DynamicListPage,
         "com.microsoft.cmdpal.builtin.websearch",
         "com.microsoft.cmdpal.builtin.windowssettings",
         "com.microsoft.cmdpal.builtin.datetime",
-        "com.microsoft.cmdpal.builtin.remotedesktop",
     ];
 
     private readonly IServiceProvider _serviceProvider;
@@ -161,7 +160,7 @@ public partial class MainListPage : DynamicListPage,
             {
                 return _tlcManager
                     .TopLevelCommands
-                    .Where(tlc => !tlc.IsFallback && !string.IsNullOrEmpty(tlc.Title))
+                    .Where(tlc => !string.IsNullOrEmpty(tlc.Title))
                     .ToArray();
             }
         }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs

@@ -6,9 +6,7 @@ using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 using CommunityToolkit.Mvvm.ComponentModel;
-using ManagedCommon;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
@@ -17,8 +15,6 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class SettingsModel : ObservableObject
 {
-    private const string DeprecatedHotkeyGoesHomeKey = "HotkeyGoesHome";
-
     [JsonIgnore]
     public static readonly string FilePath;
 
@@ -34,6 +30,8 @@ public partial class SettingsModel : ObservableObject
 
     public bool ShowAppDetails { get; set; }
 
+    public bool HotkeyGoesHome { get; set; }
+
     public bool BackspaceGoesBack { get; set; }
 
     public bool SingleClickActivates { get; set; }
@@ -58,8 +56,6 @@ public partial class SettingsModel : ObservableObject
 
     public WindowPosition? LastWindowPosition { get; set; }
 
-    public TimeSpan AutoGoHomeInterval { get; set; } = Timeout.InfiniteTimeSpan;
-
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -102,29 +98,12 @@ public partial class SettingsModel : ObservableObject
         {
             // Read the JSON content from the file
             var jsonContent = File.ReadAllText(FilePath);
-            var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel) ?? new();
 
-            var migratedAny = false;
-            try
-            {
-                if (JsonNode.Parse(jsonContent) is JsonObject root)
-                {
-                    migratedAny |= ApplyMigrations(root, loaded);
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine($"Migration check failed: {ex}");
-            }
+            var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
 
-            Debug.WriteLine("Loaded settings file");
+            Debug.WriteLine(loaded is not null ? "Loaded settings file" : "Failed to parse");
 
-            if (migratedAny)
-            {
-                SaveSettings(loaded);
-            }
-
-            return loaded;
+            return loaded ?? new();
         }
         catch (Exception ex)
         {
@@ -134,51 +113,6 @@ public partial class SettingsModel : ObservableObject
         return new();
     }
 
-    private static bool ApplyMigrations(JsonObject root, SettingsModel model)
-    {
-        var migrated = false;
-
-        // Migration #1: HotkeyGoesHome (bool) -> AutoGoHomeInterval (TimeSpan)
-        // The old 'HotkeyGoesHome' boolean indicated whether the "go home" action should happen immediately (true) or never (false).
-        // The new 'AutoGoHomeInterval' uses a TimeSpan: 'TimeSpan.Zero' means immediate, 'Timeout.InfiniteTimeSpan' means never.
-        migrated |= TryMigrate(
-            "Migration #1: HotkeyGoesHome (bool) -> AutoGoHomeInterval (TimeSpan)",
-            root,
-            model,
-            nameof(AutoGoHomeInterval),
-            DeprecatedHotkeyGoesHomeKey,
-            (settingsModel, goesHome) => settingsModel.AutoGoHomeInterval = goesHome ? TimeSpan.Zero : Timeout.InfiniteTimeSpan,
-            JsonSerializationContext.Default.Boolean);
-
-        return migrated;
-    }
-
-    private static bool TryMigrate<T>(string migrationName, JsonObject root, SettingsModel model, string newKey, string oldKey, Action<SettingsModel, T> apply, JsonTypeInfo<T> jsonTypeInfo)
-    {
-        try
-        {
-            // If new key already present, skip migration
-            if (root.ContainsKey(newKey) && root[newKey] is not null)
-            {
-                return false;
-            }
-
-            // If old key present, try to deserialize and apply
-            if (root.TryGetPropertyValue(oldKey, out var oldNode) && oldNode is not null)
-            {
-                var value = oldNode.Deserialize<T>(jsonTypeInfo);
-                apply(model, value!);
-                return true;
-            }
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Error during migration {migrationName}.", ex);
-        }
-
-        return false;
-    }
-
     public static void SaveSettings(SettingsModel model)
     {
         if (string.IsNullOrEmpty(FilePath))
@@ -205,9 +139,6 @@ public partial class SettingsModel : ObservableObject
                         savedSettings[item.Key] = item.Value?.DeepClone();
                     }
 
-                    // Remove deprecated keys
-                    savedSettings.Remove(DeprecatedHotkeyGoesHomeKey);
-
                     var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.Options);
                     File.WriteAllText(FilePath, serialized);
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs

@@ -11,19 +11,6 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 
 public partial class SettingsViewModel : INotifyPropertyChanged
 {
-    private static readonly List<TimeSpan> AutoGoHomeIntervals =
-    [
-        Timeout.InfiniteTimeSpan,
-        TimeSpan.Zero,
-        TimeSpan.FromSeconds(10),
-        TimeSpan.FromSeconds(20),
-        TimeSpan.FromSeconds(30),
-        TimeSpan.FromSeconds(60),
-        TimeSpan.FromSeconds(90),
-        TimeSpan.FromSeconds(120),
-        TimeSpan.FromSeconds(180),
-    ];
-
     private readonly SettingsModel _settings;
     private readonly IServiceProvider _serviceProvider;
 
@@ -71,6 +58,16 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool HotkeyGoesHome
+    {
+        get => _settings.HotkeyGoesHome;
+        set
+        {
+            _settings.HotkeyGoesHome = value;
+            Save();
+        }
+    }
+
     public bool BackspaceGoesBack
     {
         get => _settings.BackspaceGoesBack;
@@ -141,25 +138,6 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
-    public int AutoGoBackIntervalIndex
-    {
-        get
-        {
-            var index = AutoGoHomeIntervals.IndexOf(_settings.AutoGoHomeInterval);
-            return index >= 0 ? index : 0;
-        }
-
-        set
-        {
-            if (value >= 0 && value < AutoGoHomeIntervals.Count)
-            {
-                _settings.AutoGoHomeInterval = AutoGoHomeIntervals[value];
-            }
-
-            Save();
-        }
-    }
-
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsExtensionsViewModel Extensions { get; }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/WindowPosition.cs

@@ -2,52 +2,21 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Windows.Graphics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
 public sealed class WindowPosition
 {
-    /// <summary>
-    /// Gets or sets left position in device pixels.
-    /// </summary>
     public int X { get; set; }
 
-    /// <summary>
-    /// Gets or sets top position in device pixels.
-    /// </summary>
     public int Y { get; set; }
 
-    /// <summary>
-    /// Gets or sets width in device pixels.
-    /// </summary>
     public int Width { get; set; }
 
-    /// <summary>
-    /// Gets or sets height in device pixels.
-    /// </summary>
     public int Height { get; set; }
-
-    /// <summary>
-    /// Gets or sets width of the screen in device pixels where the window is located.
-    /// </summary>
-    public int ScreenWidth { get; set; }
-
-    /// <summary>
-    /// Gets or sets height of the screen in device pixels where the window is located.
-    /// </summary>
-    public int ScreenHeight { get; set; }
-
-    /// <summary>
-    /// Gets or sets DPI (dots per inch) of the display where the window is located.
-    /// </summary>
-    public int Dpi { get; set; }
-
-    /// <summary>
-    /// Converts the window position properties to a <see cref="RectInt32"/> structure representing the physical window rectangle.
-    /// </summary>
-    public RectInt32 ToPhysicalWindowRectangle()
-    {
-        return new RectInt32(X, Y, Width, Height);
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -13,7 +13,6 @@ using Microsoft.CmdPal.Ext.Calc;
 using Microsoft.CmdPal.Ext.ClipboardHistory;
 using Microsoft.CmdPal.Ext.Indexer;
 using Microsoft.CmdPal.Ext.Registry;
-using Microsoft.CmdPal.Ext.RemoteDesktop;
 using Microsoft.CmdPal.Ext.Shell;
 using Microsoft.CmdPal.Ext.System;
 using Microsoft.CmdPal.Ext.TimeDate;
@@ -135,9 +134,8 @@ public partial class App : Application
         try
         {
             var winget = new WinGetExtensionCommandsProvider();
-            winget.SetAllLookup(
-                query => allApps.LookupAppByPackageFamilyName(query, requireSingleMatch: true),
-                query => allApps.LookupAppByProductCode(query, requireSingleMatch: true));
+            var callback = allApps.LookupApp;
+            winget.SetAllLookup(callback);
             services.AddSingleton<ICommandProvider>(winget);
         }
         catch (Exception ex)
@@ -153,7 +151,6 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, BuiltInsCommandProvider>();
         services.AddSingleton<ICommandProvider, TimeDateCommandsProvider>();
         services.AddSingleton<ICommandProvider, SystemCommandExtensionProvider>();
-        services.AddSingleton<ICommandProvider, RemoteDesktopCommandProvider>();
 
         // Models
         services.AddSingleton<TopLevelCommandManager>();

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/DevRibbon.xaml

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<UserControl
-    x:Class="Microsoft.CmdPal.UI.Controls.DevRibbon"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
-    mc:Ignorable="d">
-
-    <UserControl.Resources>
-        <DataTemplate x:Key="LogEntryTemplate" x:DataType="viewModels:LogEntryViewModel">
-            <controls:SettingsExpander Description="{x:Bind Description}" Header="{x:Bind Header}">
-                <controls:SettingsExpander.HeaderIcon>
-                    <FontIcon Glyph="{x:Bind SeverityGlyph}" />
-                </controls:SettingsExpander.HeaderIcon>
-                <controls:SettingsExpander.Items>
-                    <controls:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Vertical">
-                        <ScrollViewer
-                            MaxWidth="1160"
-                            HorizontalScrollMode="Auto"
-                            VerticalScrollMode="Auto">
-                            <TextBlock
-                                FontFamily="Consolas"
-                                FontSize="11"
-                                Foreground="{ThemeResource SystemControlPageTextBaseMediumBrush}"
-                                IsTextSelectionEnabled="True"
-                                Text="{x:Bind Details}"
-                                TextWrapping="NoWrap" />
-                        </ScrollViewer>
-                    </controls:SettingsCard>
-                </controls:SettingsExpander.Items>
-            </controls:SettingsExpander>
-        </DataTemplate>
-
-        <converters:BoolToVisibilityConverter
-            x:Key="InvertedBoolToVisibilityConverter"
-            FalseValue="Visible"
-            TrueValue="Collapsed" />
-
-    </UserControl.Resources>
-
-    <Grid>
-        <Border
-            x:Name="RootBorder"
-            Height="26"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top"
-            Background="{ThemeResource SettingsCardBackground}"
-            BorderBrush="{ThemeResource SurfaceStrokeColorFlyoutBrush}"
-            BorderThickness="1,0,1,1"
-            CornerRadius="0,0,8,8"
-            Opacity="0.3">
-            <Button
-                Padding="0"
-                CornerRadius="0,0,8,8"
-                FontSize="11"
-                PointerEntered="DevRibbonButton_PointerEntered"
-                PointerExited="DevRibbonButton_PointerExited">
-                <StackPanel Orientation="Horizontal">
-                    <StackPanel
-                        Padding="8,4"
-                        VerticalAlignment="Center"
-                        Background="DarkOrange"
-                        Orientation="Horizontal"
-                        Visibility="{x:Bind VisibleIfGreaterThanZero(ViewModel.WarningCount), Mode=OneWay}">
-                        <FontIcon
-                            Margin="0,0,8,0"
-                            VerticalAlignment="Center"
-                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                            FontSize="12"
-                            Glyph="&#xE7BA;" />
-                        <TextBlock VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.WarningCount, Mode=OneWay}" />
-                        </TextBlock>
-                    </StackPanel>
-                    <StackPanel
-                        Padding="8,4"
-                        VerticalAlignment="Center"
-                        Background="Maroon"
-                        Orientation="Horizontal"
-                        Visibility="{x:Bind VisibleIfGreaterThanZero(ViewModel.ErrorCount), Mode=OneWay}">
-                        <FontIcon
-                            Margin="0,0,8,0"
-                            VerticalAlignment="Center"
-                            FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                            FontSize="12"
-                            Glyph="&#xEA39;" />
-                        <TextBlock VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.ErrorCount, Mode=OneWay}" />
-                        </TextBlock>
-                    </StackPanel>
-                    <Border Padding="8,4">
-                        <Border.Background>
-                            <SolidColorBrush Color="{x:Bind ViewModel.TagColor}" />
-                        </Border.Background>
-                        <TextBlock Padding="4" VerticalAlignment="Center">
-                            <Run Text="{x:Bind ViewModel.Tag}" />
-                        </TextBlock>
-                    </Border>
-                </StackPanel>
-
-                <Button.Flyout>
-                    <Flyout
-                        Placement="Bottom"
-                        ShouldConstrainToRootBounds="False"
-                        SystemBackdrop="{ThemeResource AcrylicBackgroundFillColorDefaultBackdrop}">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                <Setter Property="MinWidth" Value="600" />
-                                <Setter Property="MaxWidth" Value="1200" />
-                                <Setter Property="Padding" Value="0" />
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
-
-                        <Grid x:Name="FlyoutContent">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <StackPanel Padding="16" Spacing="8">
-
-                                <!--  Logs section  -->
-                                <TextBlock
-                                    Margin="1,0,0,6"
-                                    Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}"
-                                    Text="Logs" />
-                                <ItemsControl ItemTemplate="{StaticResource LogEntryTemplate}" ItemsSource="{x:Bind ViewModel.LatestLogs, Mode=OneWay}" />
-                                <StackPanel Orientation="Horizontal" Spacing="8">
-                                    <Button Command="{x:Bind ViewModel.OpenLogFileCommand}" Content="Open Log File" />
-                                    <Button Command="{x:Bind ViewModel.OpenLogFolderCommand}" Content="Open Log Folder" />
-                                    <Button Command="{x:Bind ViewModel.ResetErrorCountersCommand}" Content="Clear Counters" />
-                                </StackPanel>
-
-                                <!--  Build info section  -->
-                                <TextBlock Style="{ThemeResource SettingsSectionHeaderTextBlockStyle}" Text="Build Info" />
-                                <Border
-                                    Padding="16"
-                                    Background="{ThemeResource SettingsCardBackground}"
-                                    BorderBrush="{ThemeResource SettingsCardBorderBrush}"
-                                    BorderThickness="1">
-                                    <Grid ColumnSpacing="8">
-                                        <Grid.Resources>
-                                            <Style
-                                                x:Key="KeyTextBlockStyle"
-                                                BasedOn="{StaticResource CaptionTextBlockStyle}"
-                                                TargetType="TextBlock">
-                                                <Setter Property="IsTextSelectionEnabled" Value="True" />
-                                                <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
-                                            </Style>
-                                            <Style
-                                                x:Key="ValueTextBlockStyle"
-                                                BasedOn="{StaticResource CaptionTextBlockStyle}"
-                                                TargetType="TextBlock">
-                                                <Setter Property="IsTextSelectionEnabled" Value="True" />
-                                                <Setter Property="TextAlignment" Value="Right" />
-                                            </Style>
-                                        </Grid.Resources>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition />
-                                            <RowDefinition />
-                                            <RowDefinition />
-                                        </Grid.RowDefinitions>
-                                        <TextBlock
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="Configuration:" />
-                                        <TextBlock
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.BuildConfiguration, Mode=OneWay}" />
-
-                                        <TextBlock
-                                            Grid.Row="1"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="AOT:" />
-                                        <TextBlock
-                                            Grid.Row="1"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.IsAot, Mode=OneWay}" />
-
-                                        <TextBlock
-                                            Grid.Row="2"
-                                            Grid.Column="0"
-                                            Style="{StaticResource KeyTextBlockStyle}"
-                                            Text="Trimmed:" />
-                                        <TextBlock
-                                            Grid.Row="2"
-                                            Grid.Column="1"
-                                            Style="{StaticResource ValueTextBlockStyle}"
-                                            Text="{x:Bind ViewModel.IsPublishTrimmed, Mode=OneWay}" />
-
-                                    </Grid>
-                                </Border>
-                            </StackPanel>
-
-                            <!--  Footer  -->
-                            <Border
-                                Grid.Row="1"
-                                Padding="16"
-                                Background="{ThemeResource SettingsCardBackground}"
-                                BorderBrush="{ThemeResource SettingsCardBorderBrush}"
-                                BorderThickness="1"
-                                CornerRadius="{ThemeResource ControlCornerRadius}"
-                                Visibility="{x:Bind ViewModel.IsAotReleaseConfiguration, Mode=OneWay, Converter={StaticResource InvertedBoolToVisibilityConverter}}">
-                                <TextBlock Text="Warning: Test in Release/AOT configuration to verify everything works." TextWrapping="Wrap" />
-                            </Border>
-
-                        </Grid>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
-        </Border>
-        <VisualStateManager.VisualStateGroups>
-            <VisualStateGroup x:Name="CommonStates">
-                <VisualState x:Name="Normal" />
-                <VisualState x:Name="PointerOver">
-                    <Storyboard>
-                        <DoubleAnimation
-                            Storyboard.TargetName="RootBorder"
-                            Storyboard.TargetProperty="Opacity"
-                            To="1.0"
-                            Duration="0:0:0.1" />
-                    </Storyboard>
-                </VisualState>
-            </VisualStateGroup>
-            <VisualStateGroup x:Name="SeverityStates">
-                <VisualState x:Name="NoLog" />
-                <VisualState x:Name="WarningLog">
-                    <Storyboard>
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SeverityIcon" Storyboard.TargetProperty="Glyph">
-                            <DiscreteObjectKeyFrame KeyTime="0" Value="&#xE7BA;" />
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-                <VisualState x:Name="ErrorLog">
-                    <Storyboard>
-                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="SeverityIcon" Storyboard.TargetProperty="Glyph">
-                            <DiscreteObjectKeyFrame KeyTime="0" Value="&#xEA39;" />
-                        </ObjectAnimationUsingKeyFrames>
-                    </Storyboard>
-                </VisualState>
-            </VisualStateGroup>
-        </VisualStateManager.VisualStateGroups>
-    </Grid>
-</UserControl>

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/DevRibbon.xaml.cs

@@ -1,40 +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 Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Input;
-
-namespace Microsoft.CmdPal.UI.Controls;
-
-internal sealed partial class DevRibbon : UserControl
-{
-    public ViewModels.DevRibbonViewModel ViewModel { get; }
-
-    public DevRibbon()
-    {
-        InitializeComponent();
-        ViewModel = new ViewModels.DevRibbonViewModel();
-
-        if (FlyoutContent != null)
-        {
-            FlyoutContent.DataContext = ViewModel;
-        }
-    }
-
-    private void DevRibbonButton_PointerEntered(object sender, PointerRoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, "PointerOver", true);
-    }
-
-    private void DevRibbonButton_PointerExited(object sender, PointerRoutedEventArgs e)
-    {
-        VisualStateManager.GoToState(this, "Normal", true);
-    }
-
-    private Visibility VisibleIfGreaterThanZero(int value)
-    {
-        return value > 0 ? Visibility.Visible : Visibility.Collapsed;
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemContainerStyleSelector.cs

@@ -1,31 +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 Microsoft.CmdPal.Core.ViewModels;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed partial class GridItemContainerStyleSelector : StyleSelector
-{
-    public IGridPropertiesViewModel? GridProperties { get; set; }
-
-    public Style? Small { get; set; }
-
-    public Style? Medium { get; set; }
-
-    public Style? Gallery { get; set; }
-
-    protected override Style? SelectStyleCore(object item, DependencyObject container)
-    {
-        return GridProperties switch
-        {
-            SmallGridPropertiesViewModel => Small,
-            MediumGridPropertiesViewModel => Medium,
-            GalleryGridPropertiesViewModel => Gallery,
-            _ => Medium,
-        };
-    }
-}

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/GridItemTemplateSelector.cs

@@ -20,12 +20,21 @@ internal sealed partial class GridItemTemplateSelector : DataTemplateSelector
 
     protected override DataTemplate? SelectTemplateCore(object item, DependencyObject dependencyObject)
     {
-        return GridProperties switch
+        DataTemplate? dataTemplate = Medium;
+
+        if (GridProperties is SmallGridPropertiesViewModel)
         {
-            SmallGridPropertiesViewModel => Small,
-            MediumGridPropertiesViewModel => Medium,
-            GalleryGridPropertiesViewModel => Gallery,
-            _ => Medium,
-        };
+            dataTemplate = Small;
+        }
+        else if (GridProperties is MediumGridPropertiesViewModel)
+        {
+            dataTemplate = Medium;
+        }
+        else if (GridProperties is GalleryGridPropertiesViewModel)
+        {
+            dataTemplate = Gallery;
+        }
+
+        return dataTemplate;
     }
 }