Add list background opacity setting for CmdPal

Co-authored-by: crutkas <1462282+crutkas@users.noreply.github.com>

.config/configuration.vsEnterprise.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.vsProfessional.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.config/configuration.winget

@@ -2,14 +2,14 @@
 # Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
   resources:
-    - resource: Microsoft.Windows.Settings/WindowsSettings
+    - resource: Microsoft.Windows.Developer/DeveloperMode
       directives:
         description: Enable Developer Mode
         allowPrerelease: true
         # Requires elevation for the set operation
         securityContext: elevated
       settings:
-        DeveloperMode: true
+        Ensure: Present
     - resource: Microsoft.WinGet.DSC/WinGetPackage
       id: vsPackage
       directives:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: X.XX.X
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 
@@ -20,7 +20,7 @@ body:
   type: dropdown
   attributes:
     label: Installation method
-    description: How / where was PowerToys installed from?
+    description: How / Where was PowerToys installed from?
     multiple: true
     options:
       - GitHub

.github/ISSUE_TEMPLATE/documentation-issue.yml

@@ -6,7 +6,7 @@ labels:
 body:
 - type: textarea
   attributes: 
-    label: Describe the requested doc changes
+    label: Provide a description of requested docs changes
     placeholder: Briefly describe which document needs to be corrected and why.
   validations:
     required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -13,7 +13,7 @@ body:
 - type: textarea
   attributes:
     label: Scenario when this would be used?
-    placeholder: What is the scenario this would be used in? Why is this important to your workflow as a power user?
+    placeholder: What is the scenario this would be used? Why is this important to your workflow as a power user?
   validations:
     required: true
 - type: textarea

.github/ISSUE_TEMPLATE/translation_issue.yml

@@ -14,7 +14,7 @@ body:
   attributes:
     label: Microsoft PowerToys version
     placeholder: 0.70.0
-    description: Hover over the system tray icon or look at Settings
+    description: Hover over system tray icon or look at Settings
   validations:
     required: true
 - type: dropdown
@@ -65,7 +65,7 @@ body:
 - type: textarea
   attributes: 
     label: ❌ Actual phrase(s)
-    placeholder: What is there? Please include a screenshot, as that is extremely helpful.
+    placeholder: What is there? Please include a screenshot as that is extremely helpful.
   validations:
     required: true
 - type: textarea

.github/actions/spell-check/allow/names.txt

@@ -46,8 +46,8 @@ betsegaw
 bricelam
 bsky
 CCcat
-chemwolf
 chenmy
+chemwolf
 Chinh
 chrdavis
 Chrzan
@@ -65,8 +65,8 @@ Deondre
 DHowett
 ductdo
 Essey
-ethanfangg
 Feng
+ethanfangg
 ferraridavide
 foxmsft
 frankychen
@@ -77,7 +77,6 @@ Galaxi
 Garside
 Gershaft
 Giordani
-Gleb
 Gokce
 gordon
 Griese
@@ -96,7 +95,6 @@ Huynh
 Ionut
 jamrobot
 Jaswal
-Jaylyn
 jefflord
 Jordi
 jyuwono
@@ -107,7 +105,6 @@ Kantarci
 Karthick
 kaylacinnamon
 kevinguo
-Khmyznikov
 Krigun
 Lambson
 Laute
@@ -130,8 +127,6 @@ Naro
 nathancartlidge
 Nemeth
 nielslaute
-Noraa
-noraajunker
 oldnewthing
 onegreatworld
 palenshus
@@ -151,13 +146,11 @@ ricardosantos
 riri
 ritchielawrence
 robmikh
-ruslanlap
 Russinovich
 Rutkas
 ryanbodrug
 saahmedm
 sachaple
-Sameerjs
 Santossio
 Schoen
 Sekan
@@ -176,7 +169,6 @@ TBM
 tilovell
 Triet
 urnotdfs
-vednig
 waaverecords
 wang
 Whuihuan
@@ -195,6 +187,9 @@ zhaopy
 zhaoqpcn
 Zoltan
 Zykova
+Sameerjs
+ruslanlap
+vednig
 
 # OTHERS
 

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

@@ -14,7 +14,6 @@ AColumn
 acrt
 ACTIVATEAPP
 activationaction
-ACTIVATEOPTIONS
 ACVS
 adaptivecards
 ADate
@@ -789,7 +788,6 @@ LCIDTo
 Lclean
 Ldone
 Ldr
-LEFTALIGN
 LEFTSCROLLBAR
 LEFTTEXT
 LError
@@ -1590,7 +1588,6 @@ steamapps
 STGC
 STGM
 STGMEDIUM
-STGMREAD
 STICKYKEYS
 sticpl
 storelogo
@@ -1695,7 +1692,6 @@ TLayout
 tlb
 tlbimp
 tlc
-TGM
 TNP
 Toolhelp
 toolkitconverters
@@ -1999,15 +1995,3 @@ culori
 Evercoder
 LCh
 CIELCh
-CLSCTXINPROCALL
-IIDI
-irow
-lcid
-OTHERUNZOOM
-OTHERZOOM
-PARENTCLOSING
-PARENTOPENING
-ppwsz
-rguid
-SCROLLCHILDREN
-VARTYPE

.github/pull_request_template.md

@@ -5,9 +5,9 @@
 ## PR Checklist
 
 - [ ] **Closes:** #xxx
-- [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
+- [ ] **Communication:** I've discussed this with core contributors already. If 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
+- [ ] **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
@@ -16,7 +16,7 @@
    - [ ] [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 -->
+<!-- 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 -->

.github/workflows/spelling2.yml

@@ -93,7 +93,7 @@ jobs:
     steps:
       - name: check-spelling
         id: spelling
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           suppress_push_for_open_pull_request: ${{ github.actor != 'dependabot[bot]' && 1 }}
@@ -156,7 +156,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -175,7 +175,7 @@ jobs:
     if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
     steps:
       - name: comment
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           config: .github/actions/spell-check
           checkout: true
@@ -202,7 +202,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: apply spelling updates
-        uses: check-spelling/check-spelling@c635c2f3f714eec2fcf27b643a1919b9a811ef2e # v0.0.25
+        uses: check-spelling/check-spelling@67debf50669c7fc76fc8f5d7f996384535a72b77 # v0.0.24
         with:
           experimental_apply_changes_via_bot: ${{ github.repository_owner != 'microsoft' && 1 }}
           checkout: true

.pipelines/verifyAndSetLatestVCToolsVersion.ps1

@@ -1,28 +1,7 @@
 $VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
-$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
 $LatestVCToolsVersion = $LatestVCPackage.version;
-
-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
-$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
-
-# We have observed a few instances where the VC tools package version actually
-# differs from the version on the files themselves. We might as well check
-# whether the version we just found _actually exists_ before we use it.
-# We'll use whichever highest version exists.
-$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
-        [Version]$_.Name
-    } | Sort -Descending
-    $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
-
-    If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
-        Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
-        $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
-    }
-}
-
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
 Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

COMMUNITY.md

@@ -6,8 +6,8 @@ Names are in alphabetical order based on first name.
 
 ## High impact community members
 
-### [@Noraa-Junker](https://github.com/Noraa-Junker) - [Noraa Junker](https://noraajunker.ch)
-Noraa has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Noraa was the primary person for helping build the File Explorer preview pane handler for developer files.
+### [@Aaron-Junker](https://github.com/Aaron-Junker) - [Aaron Junker](https://aaron-junker.github.io)
+Aaron has helped triaging, discussing, and creating a substantial number of issues and contributed features/fixes. Aaron was the primary person for helping build the File Explorer preview pane handler for developer files.
 
 ### [@cgaarden](https://github.com/cgaarden) - [Christian Gaarden Gaardmark](https://www.onegreatworld.com) 
 Christian contributed New+ utility
@@ -117,6 +117,10 @@ PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Expl
 
 PowerToys Awake is a tool to keep your computer awake.
 
+### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/)
+
+Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118).
+
 ### [@randyrants](https://github.com/randyrants) - [Randy Santossio](https://www.randyrants.com)
 
 Randy contributed Registry Preview and some very early conversations about keyboard remapping.
@@ -180,10 +184,10 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 
 ## PowerToys core team
 
+- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Lead
 - [@cinnamon-msft](https://github.com/cinnamon-msft) - Kayla Cinnamon - Lead
 - [@nguyen-dows](https://github.com/nguyen-dows) - Christopher Nguyen - Product Manager
 - [@craigloewen-msft](https://github.com/craigloewen-msft) - Craig Loewen - Product Manager
-- [@niels9001](https://github.com/niels9001/) - Niels Laute - Product Manager
 - [@zhiwei-ms](https://github.com/zhiwei-ms) - Zhiwei Yu - Product Manager
 - [@dhowett](https://github.com/dhowett) - Dustin Howett - Dev lead
 - [@yeelam-gordon](https://github.com/yeelam-gordon) - Gordon Lam - Dev lead
@@ -200,12 +204,6 @@ ZoomIt source code was originally implemented by [Sysinternals](https://sysinter
 - [@zhaopy536](https://github.com/zhaopy536) - Peiyao Zhao - Dev
 - [@wang563681252](https://github.com/wang563681252) - Zhaopeng Wang - Dev
 - [@vanzue](https://github.com/vanzue) - Kai Tao - Dev
-- [@zadjii-msft](https://github.com/zadjii-msft) - Mike Griese - Dev
-- [@khmyznikov](https://github.com/khmyznikov) - Gleb Khmyznikov - Dev
-- [@chatasweetie](https://github.com/chatasweetie) - Jessica Earley-Cha - Dev
-- [@MichaelJolley](https://github.com/MichaelJolley) - Michael Jolley - Dev
-- [@Jaylyn-Barbee](https://github.com/Jaylyn-Barbee) - Jaylyn Barbee - Dev
-- [@crutkas](https://github.com/crutkas/) - Clint Rutkas - Overhead
 
 ## Former PowerToys core team members
 

Directory.Packages.props

@@ -31,22 +31,22 @@
     <!-- Including MessagePack to force version, since it's used by StreamJsonRpc but contains vulnerabilities. After StreamJsonRpc updates the version of MessagePack, we can upgrade StreamJsonRpc instead. -->
     <PackageVersion Include="MessagePack" Version="3.1.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.5" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.5" />
     <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <!-- Package Microsoft.Win32.SystemEvents added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Drawing.Common but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.5" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.5" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <!-- CsWinRT version needs to be set to have a WinRT.Runtime.dll at the same version contained inside the NET SDK we're currently building on CI. -->
     <!-- 
@@ -72,28 +72,28 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <!-- Package System.CodeDom added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Management but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.CodeDom" Version="9.0.6" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.5" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.6" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.6" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.6" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.5" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.5" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.5" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
-    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.5" />
     <!-- Package System.Diagnostics.PerformanceCounter added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.11. -->
-    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.6" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.6" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.5" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.5" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.6" />
+    <PackageVersion Include="System.Management" Version="9.0.5" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reactive" Version="6.0.1" />
-    <PackageVersion Include="System.Runtime.Caching" Version="9.0.6" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.5" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.5" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageVersion Include="UnicodeInformation" Version="2.6.0" />
     <PackageVersion Include="UnitsNet" Version="5.56.0" />

NOTICE.md

@@ -1453,22 +1453,22 @@ SOFTWARE.
 - Mages 3.0.0
 - Markdig.Signed 0.34.0
 - MessagePack 3.1.3
-- Microsoft.Bcl.AsyncInterfaces 9.0.6
+- Microsoft.Bcl.AsyncInterfaces 9.0.5
 - Microsoft.CodeAnalysis.NetAnalyzers 9.0.0
-- Microsoft.Data.Sqlite 9.0.6
+- Microsoft.Data.Sqlite 9.0.5
 - Microsoft.Diagnostics.Tracing.TraceEvent 3.1.16
 - Microsoft.DotNet.ILCompiler (A)
-- Microsoft.Extensions.DependencyInjection 9.0.6
-- Microsoft.Extensions.Hosting 9.0.6
-- Microsoft.Extensions.Hosting.WindowsServices 9.0.6
-- Microsoft.Extensions.Logging 9.0.6
-- Microsoft.Extensions.Logging.Abstractions 9.0.6
+- Microsoft.Extensions.DependencyInjection 9.0.5
+- Microsoft.Extensions.Hosting 9.0.5
+- Microsoft.Extensions.Hosting.WindowsServices 9.0.5
+- Microsoft.Extensions.Logging 9.0.5
+- Microsoft.Extensions.Logging.Abstractions 9.0.5
 - Microsoft.NET.ILLink.Tasks (A)
 - Microsoft.SemanticKernel 1.15.0
 - Microsoft.Toolkit.Uwp.Notifications 7.1.2
 - Microsoft.Web.WebView2 1.0.2903.40
-- Microsoft.Win32.SystemEvents 9.0.6
-- Microsoft.Windows.Compatibility 9.0.6
+- Microsoft.Win32.SystemEvents 9.0.5
+- Microsoft.Windows.Compatibility 9.0.5
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
@@ -1487,25 +1487,25 @@ SOFTWARE.
 - SharpCompress 0.37.2
 - StreamJsonRpc 2.21.69
 - StyleCop.Analyzers 1.2.0-beta.556
-- System.CodeDom 9.0.6
+- System.CodeDom 9.0.5
 - System.CommandLine 2.0.0-beta4.22272.1
-- System.ComponentModel.Composition 9.0.6
-- System.Configuration.ConfigurationManager 9.0.6
-- System.Data.OleDb 9.0.6
-- System.Data.SqlClient 4.9.0
-- System.Diagnostics.EventLog 9.0.6
-- System.Diagnostics.PerformanceCounter 9.0.6
-- System.Drawing.Common 9.0.6
+- System.ComponentModel.Composition 9.0.5
+- System.Configuration.ConfigurationManager 9.0.5
+- System.Data.OleDb 9.0.5
+- System.Data.SqlClient 4.8.6
+- System.Diagnostics.EventLog 9.0.5
+- System.Diagnostics.PerformanceCounter 9.0.5
+- System.Drawing.Common 9.0.5
 - System.IO.Abstractions 22.0.13
 - System.IO.Abstractions.TestingHelpers 22.0.13
-- System.Management 9.0.6
+- System.Management 9.0.5
 - System.Net.Http 4.3.4
 - System.Private.Uri 4.3.2
 - System.Reactive 6.0.1
-- System.Runtime.Caching 9.0.6
-- System.ServiceProcess.ServiceController 9.0.6
-- System.Text.Encoding.CodePages 9.0.6
-- System.Text.Json 9.0.6
+- System.Runtime.Caching 9.0.5
+- System.ServiceProcess.ServiceController 9.0.5
+- System.Text.Encoding.CodePages 9.0.5
+- System.Text.Json 9.0.5
 - System.Text.RegularExpressions 4.3.1
 - UnicodeInformation 2.6.0
 - UnitsNet 5.56.0

README.md

@@ -53,10 +53,10 @@ This is our preferred method.
 
 ### Via Microsoft Store
 
-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
+Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/) which is available for both Windows 11 and Windows 10.
 
 ### Via WinGet
-Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
+Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
 #### User scope installer [default]
 ```powershell
@@ -79,7 +79,7 @@ There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) cr
 
 ## Contributing
 
-This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
+This project welcomes contributions of all types.  Besides  coding features / bug fixes,  other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
 
 We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort.
 
@@ -99,7 +99,7 @@ In this release, we focused on new features, stability, and automation.
 
 **✨Highlights**
 
- - We focused on greatly improving the Command Palette's performance and fixing a large number of bugs. Some new features we've added are:
+ - We focused on greatly improving Command Palette's performance and fixing a large amount of bugs. Some new features we've added are:
  - Added the ability for Command Palette to search any file using a fallback command.
  - Added the ability to make the Command Palette global hotkey a low-level keyboard hook.
  - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette.
@@ -117,17 +117,17 @@ In this release, we focused on new features, stability, and automation.
 
 ### Command Not Found
 
- - Updated the WinGet Command Not Found script to only enable the experimental features if they exist.
+ - Updated the WinGet Command Not Found script to only enable the experimental features if they actually exist.
 
 ### Command Palette
 
  - Updated bug template to include Command Palette module.
  - Fixed an issue where the toast window was not scaled for DPI, causing layout issues under display scaling.
- - Fixed an issue where Up/Down keyboard navigation didn't move selection when the caret was at position 0, and added continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Fixed an issue where Up/Down keyboard navigation didn't move selection when caret was at position 0, and add continuous navigation like PT Run v1. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
  - Updated the Time and Date extension code to simplify it and improve clarity.
  - Fixed an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
- - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from the Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added setting to enable/disable system tray icon in CmdPal and aligned terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+ - Added open URL fallback command for the WebSearch extension, enabling users to directly open URLs in the browser from Command Palette. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added setting to enable/disable system tray icon in CmdPal and align terminology with Windows 11. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
  - Fixed an alias update issue by removing the old alias when a new one is set.
  - Resolved GitHub casing conflict by migrating Exts and exts into a new ext directory, ensuring consistent structure across platforms and preventing path fragmentation.
  - Fix an issue where the 'Create New Extension' command generated empty file names.
@@ -155,9 +155,9 @@ In this release, we focused on new features, stability, and automation.
  - Refactored CmdPal classes to improve JSON serialization and introduced new serialization contexts for better performance and maintainability.
  - Added support for ahead-of-time (AoT) compilation.
  - Added retry mechanism for CmdPal launch.
- - Removed some unused files from CmdPal.Common to simplify the codebase and facilitate marking it as AoT-compatible.
+ - Removed some unused files from CmdPal.Common to simplify codebase and facilitate marking it as AoT-compatible.
  - Fixed a bug where a race condition in the update of SearchText caused the cursor in the input box to automatically jump to the end of the line, ensuring SearchText is only updated after it has actually been changed.
- - Added support for searching any file in the fallback command.
+ - Added support for searching any file in fallback command.
  - Cleaned up AoT-related code to prevent duplicate operations during testing.
  - Reduced CmdPal load time by parallelizing extension startup and adding timeouts to prevent misbehaving extensions from blocking others.
  - Enhanced UI behavior by dismissing the details pane when the list gets emptied, avoiding inconsistent visual states.
@@ -179,7 +179,7 @@ In this release, we focused on new features, stability, and automation.
 
 ### Keyboard Manager
 
- - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
+ - Fixed an issue where a modifier key, when set without specifying left or right, would get stuck due to incorrect key handling, by tracking the pressed keys and sending the correct key accordingly. Thanks [@mantaionut](https://github.com/mantaionut)!
 
 ### PowerRename
 
@@ -187,7 +187,7 @@ In this release, we focused on new features, stability, and automation.
 
 ### PowerToys Run
 
- - Added support for custom formats in the "Time and Date" plugin and improved error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
+ - Added support for custom formats in the "Time and Date" plugin and improves error messages for invalid input formats. Thanks [@htcfreek](https://github.com/htcfreek)!
  - Fix two crashes: one for WFT on very early dates and another for calculating the week of the month on very late dates (e.g., 31.12.9999), and reorder UI settings. Thanks [@htcfreek](https://github.com/htcfreek)!
  - Fix an issue where capitalization in the command causes failure when trying to go to the mouse pointer, resolved by adjusting the command to lowercase.
  - Added version details to plugin error messages for 'Loading error' and 'Init error'. Thanks [@htcfreek](https://github.com/htcfreek)!
@@ -254,7 +254,7 @@ For [v0.92][github-next-release-work], we'll work on the items below:
  - New UI Automation tests
  - Working on installer upgrades
  - Upgrading Keyboard Manager's editor UI
- - Stability, bug fixes
+ - Stability / bug fixes
 
 ## PowerToys Community
 
@@ -266,7 +266,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct
 
 ## Privacy Statement
 
-The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
+The application logs basic diagnostic data (telemetry). For more information on privacy and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
 
 [oss-CLA]: https://cla.opensource.microsoft.com
 [oss-conduct-code]: CODE_OF_CONDUCT.md

doc/thirdPartyRunPlugins.md

@@ -46,7 +46,6 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [QuickNotes](https://github.com/ruslanlap/CommunityPowerToysRunPlugin-QuickNotes) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and search notes directly from PowerToys Run. |
 | [Weather](https://github.com/ruslanlap/PowerToysRun-Weather) | [ruslanlap](https://github.com/ruslanlap) | Get real-time weather information directly from PowerToys Run. |
 | [Pomodoro](https://github.com/ruslanlap/PowerToysRun-Pomodoro) | [ruslanlap](https://github.com/ruslanlap) | Manage Pomodoro productivity sessions directly from PowerToys Run. |
-| [Definition](https://github.com/ruslanlap/PowerToysRun-Definition) | [ruslanlap](https://github.com/ruslanlap) | Lookup word definitions, phonetics, and synonyms directly in PowerToys Run. |
 
 ## Extending software plugins
 
@@ -69,5 +68,4 @@ Below are community created plugins that target a website or software.  They are
 | [Bilibili](https://github.com/Whuihuan/PowerToysRun-Bilibili) | [Whuihuan](https://github.com/Whuihuan) | Use AVID or BVID to parse and jump to Bilibili |
 | [YubicoOauthOTP](https://github.com/dlnilsson/Community.PowerToys.Run.Plugin.YubicoOauthOTP) | [dlnilsson](https://github.com/dlnilsson) | Display generated codes from OATH accounts stored on the YubiKey in powerToys Run  |
 | [Firefox Bookmark](https://github.com/8LWXpg/PowerToysRun-FirefoxBookmark) | [8LWXpg](https://github.com/8LWXpg) | Open bookmarks in Firefox based browser |
-| [Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |
-| [SpeedTest](https://github.com/ruslanlap/PowerToysRun-SpeedTest) | [ruslanlap](https://github.com/ruslanlap) | One-command internet speed tests with real-time results, modern UI, and shareable links. |
+[Linear](https://github.com/vednig/powertoys-linear) | [vednig](https://github.com/vednig) | Create Linear Issues directly from Powertoys Run |

src/Common.Dotnet.AotCompatibility.props

@@ -7,6 +7,6 @@
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
 
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;CsWinRT1028;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081;$(WarningsNotAsErrors)</WarningsNotAsErrors>
   </PropertyGroup>
 </Project>

src/Common.Dotnet.CsWinRT.props

@@ -22,7 +22,7 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugSymbols>true</DebugSymbols>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
   </PropertyGroup>
 
@@ -43,4 +43,4 @@
       <Analyzer Remove="@(Analyzer)" Condition="%(Analyzer.NuGetPackageId) == 'Microsoft.Windows.CsWinRT'" />	  
     </ItemGroup>
   </Target>
-</Project>
+</Project>

src/common/FilePreviewCommon/QoiImage.cs

@@ -92,9 +92,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                 var run = 0;
                 var chunksLen = fileSize - QOI_PADDING_LENGTH;
 
-                var x = 0;
-                var rowAdd = bitmapData.Stride - (channels * bitmapData.Width);
-
                 for (var dataIndex = 0; dataIndex < dataLength; dataIndex += channels)
                 {
                     if (run > 0)
@@ -156,14 +153,6 @@ namespace Microsoft.PowerToys.FilePreviewCommon
                             bitmapPixel[3] = pixel.A;
                         }
                     }
-
-                    x++;
-                    if (x == bitmapData.Width)
-                    {
-                        // We align dataIndex with the stride
-                        dataIndex += rowAdd;
-                        x = 0;
-                    }
                 }
 
                 bitmap.UnlockBits(bitmapData);

src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw

@@ -152,7 +152,6 @@
   </data>
   <data name="ClipboardHistoryImage" xml:space="preserve">
     <value>Image data</value>
-    <comment>Label used to represent an image in the clipboard history</comment>
   </data>
   <data name="ClipboardHistoryItemMoreOptionsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More options</value>
@@ -195,19 +194,15 @@
   </data>
   <data name="TranscodeToMp3" xml:space="preserve">
     <value>Transcode to .mp3</value>
-    <comment>Option to transcode audio files to MP3 format</comment>
   </data>  
   <data name="TranscodeToMp4" xml:space="preserve">
     <value>Transcode to .mp4 (H.264/AAC)</value>
-    <comment>Option to transcode video files to MP4 format with H.264 video codec and AAC audio codec</comment>
   </data>
   <data name="TranscodeErrorGeneral" xml:space="preserve">
     <value>An error occurred while transcoding media file</value>
-    <comment>Error message displayed when media conversion fails for an unknown or general reason</comment>
   </data>
   <data name="TranscodeErrorUnsupportedCodec" xml:space="preserve">
     <value>The media file contains an unsupported codec</value>
-    <comment>Error message displayed when media conversion fails due to an unsupported codec in the source file</comment>
   </data>
   <data name="PasteButtonAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Paste</value>

src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs

@@ -193,29 +193,27 @@ namespace WorkspacesEditor.ViewModels
             ApplyShortcut(editedProject);
         }
 
-        private string GetDesktopShortcutAddress(Project project) => Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
-
-        private string GetShortcutStoreAddress(Project project)
-        {
-            var dataFolder = FolderUtils.DataFolder();
-            Directory.CreateDirectory(dataFolder);
-            var shortcutStoreFolder = Path.Combine(dataFolder, "WorkspacesIcons");
-            Directory.CreateDirectory(shortcutStoreFolder);
-            return Path.Combine(shortcutStoreFolder, project.Id + ".ico");
-        }
-
         private void ApplyShortcut(Project project)
         {
+            string basePath = AppDomain.CurrentDomain.BaseDirectory;
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), project.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), project.Id + ".ico");
+
             if (!project.IsShortcutNeeded)
             {
-                RemoveShortcut(project);
+                if (File.Exists(shortcutIconFilename))
+                {
+                    File.Delete(shortcutIconFilename);
+                }
+
+                if (File.Exists(shortcutAddress))
+                {
+                    File.Delete(shortcutAddress);
+                }
+
                 return;
             }
 
-            var basePath = AppDomain.CurrentDomain.BaseDirectory;
-            var shortcutAddress = GetDesktopShortcutAddress(project);
-            var shortcutIconFilename = GetShortcutStoreAddress(project);
-
             Bitmap icon = WorkspacesIcon.DrawIcon(WorkspacesIcon.IconTextFromProjectName(project.Name), App.ThemeManager.GetCurrentTheme());
             WorkspacesIcon.SaveIcon(icon, shortcutIconFilename);
 
@@ -362,8 +360,8 @@ namespace WorkspacesEditor.ViewModels
 
         private void RemoveShortcut(Project selectedProject)
         {
-            string shortcutAddress = GetDesktopShortcutAddress(selectedProject);
-            string shortcutIconFilename = GetShortcutStoreAddress(selectedProject);
+            string shortcutAddress = Path.Combine(FolderUtils.Desktop(), selectedProject.Name + ".lnk");
+            string shortcutIconFilename = Path.Combine(FolderUtils.Temp(), selectedProject.Id + ".ico");
 
             if (File.Exists(shortcutIconFilename))
             {

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props

@@ -12,6 +12,6 @@
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <PackageVersion Include="Shmuelie.WinRTServer" Version="2.1.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.5" />
   </ItemGroup>
 </Project>

src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj

@@ -56,35 +56,13 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PublishSingleFile>true</PublishSingleFile>
     <IsAotCompatible>true</IsAotCompatible>
-
     <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
     <CsWinRTAotWarningLevel>2</CsWinRTAotWarningLevel>
     <!-- Suppress DynamicallyAccessedMemberTypes.PublicParameterlessConstructor in fallback code path of Windows SDK projection -->
-    <WarningsNotAsErrors>IL2081;$(WarningsNotAsErrors)</WarningsNotAsErrors>
+    <WarningsNotAsErrors>IL2081</WarningsNotAsErrors>
 
-    <!-- When publishing trimmed, make sure to treat trimming warnings as build errors -->
-    <ILLinkTreatWarningsAsErrors>true</ILLinkTreatWarningsAsErrors>
-
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <!-- In Debug builds, trimming is disabled by default, but all the trim & 
-         AOT warnings are enabled. This gives debug builds a tighter inner loop,
-         while at least warning about future trim violations -->
-    <PublishTrimmed>false</PublishTrimmed>
-    
-    <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
-    <EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
-    <EnableAotAnalyzer>true</EnableAotAnalyzer>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)'!='Debug'">
-    <!-- In Release builds, trimming is enabled by default. 
-         feel free to disable this if needed -->
     <PublishTrimmed>true</PublishTrimmed>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
-
-
 </Project>

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

@@ -79,9 +79,6 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
             throw;
         }
 
-        var oneContent = newContent.Count == 1;
-        newContent.ForEach(c => c.OnlyControlOnPage = oneContent);
-
         // Now, back to a UI thread to update the observable collection
         DoOnUiThread(
         () =>

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

@@ -7,5 +7,4 @@ namespace Microsoft.CmdPal.UI.ViewModels;
 public abstract partial class ContentViewModel(WeakReference<IPageContext> context) :
     ExtensionObjectViewModel(context)
 {
-    public bool OnlyControlOnPage { get; internal set; }
 }

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

@@ -1,42 +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.UI.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.UI.ViewModels;
-
-public partial class DetailsCommandsViewModel(
-    IDetailsElement _detailsElement,
-    WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
-{
-    public List<CommandViewModel> Commands { get; private set; } = [];
-
-    public bool HasCommands => Commands.Count > 0;
-
-    private readonly ExtensionObject<IDetailsCommands> _dataModel =
-        new(_detailsElement.Data as IDetailsCommands);
-
-    public override void InitializeProperties()
-    {
-        base.InitializeProperties();
-        var model = _dataModel.Unsafe;
-        if (model == null)
-        {
-            return;
-        }
-
-        Commands = model
-            .Commands?
-            .Select(c =>
-            {
-                var vm = new CommandViewModel(c, PageContext);
-                vm.InitializeProperties();
-                return vm;
-            })
-            .ToList() ?? [];
-        UpdateProperty(nameof(HasCommands));
-        UpdateProperty(nameof(Commands));
-    }
-}

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

@@ -49,7 +49,6 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
                 {
                     IDetailsSeparator => new DetailsSeparatorViewModel(element, this.PageContext),
                     IDetailsLink => new DetailsLinkViewModel(element, this.PageContext),
-                    IDetailsCommands => new DetailsCommandsViewModel(element, this.PageContext),
                     IDetailsTags => new DetailsTagsViewModel(element, this.PageContext),
                     _ => null,
                 };

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

@@ -50,6 +50,8 @@ public partial class SettingsModel : ObservableObject
 
     public MonitorBehavior SummonOn { get; set; } = MonitorBehavior.ToMouse;
 
+    public int ListBackgroundOpacity { get; set; } = 100;
+
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 

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

@@ -118,6 +118,17 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public int ListBackgroundOpacity
+    {
+        get => _settings.ListBackgroundOpacity;
+        set
+        {
+            _settings.ListBackgroundOpacity = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ListBackgroundOpacity)));
+            Save();
+        }
+    }
+
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)

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

@@ -11,7 +11,6 @@
                 <!--  Other merged dictionaries here  -->
                 <ResourceDictionary Source="Styles/Button.xaml" />
                 <ResourceDictionary Source="Styles/Colors.xaml" />
-                <ResourceDictionary Source="Styles/TextBlock.xaml" />
                 <ResourceDictionary Source="Styles/TextBox.xaml" />
                 <ResourceDictionary Source="Styles/Settings.xaml" />
                 <ResourceDictionary Source="Controls/Tag.xaml" />

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

@@ -8,7 +8,6 @@ using Microsoft.CmdPal.Common.Services;
 using Microsoft.CmdPal.Ext.Apps;
 using Microsoft.CmdPal.Ext.Bookmarks;
 using Microsoft.CmdPal.Ext.Calc;
-using Microsoft.CmdPal.Ext.ClipboardHistory;
 using Microsoft.CmdPal.Ext.Indexer;
 using Microsoft.CmdPal.Ext.Registry;
 using Microsoft.CmdPal.Ext.Shell;
@@ -20,7 +19,6 @@ using Microsoft.CmdPal.Ext.WindowsSettings;
 using Microsoft.CmdPal.Ext.WindowsTerminal;
 using Microsoft.CmdPal.Ext.WindowWalker;
 using Microsoft.CmdPal.Ext.WinGet;
-using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 using Microsoft.CmdPal.UI.ViewModels.Models;
@@ -102,7 +100,8 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, IndexerCommandsProvider>();
         services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
 
-        services.AddSingleton<ICommandProvider, ClipboardHistoryCommandsProvider>();
+        // TODO GH #527 re-enable the clipboard commands
+        // services.AddSingleton<ICommandProvider, ClipboardHistoryCommandsProvider>();
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
         services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
 
@@ -141,7 +140,6 @@ public partial class App : Application
         var state = AppStateModel.LoadState();
         services.AddSingleton(state);
         services.AddSingleton<IExtensionService, ExtensionService>();
-        services.AddSingleton<TrayIconService>();
 
         // ViewModels
         services.AddSingleton<ShellViewModel>();

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

@@ -34,13 +34,8 @@
                 Orientation="Vertical"
                 Spacing="4" />
 
-            <cmdpalUI:ContextItemTemplateSelector
-                x:Key="ContextItemTemplateSelector"
-                Critical="{StaticResource CriticalContextMenuViewModelTemplate}"
-                Default="{StaticResource DefaultContextMenuViewModelTemplate}" />
-
-            <!--  Template for context items in the context item menu  -->
-            <DataTemplate x:Key="DefaultContextMenuViewModelTemplate" x:DataType="viewmodels:CommandContextItemViewModel">
+            <!--  Template for actions in the mode actions dropdown button  -->
+            <DataTemplate x:Key="ContextMenuViewModelTemplate" x:DataType="viewmodels:CommandContextItemViewModel">
                 <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
@@ -68,38 +63,6 @@
                         Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
                 </Grid>
             </DataTemplate>
-
-            <!--  Template for context items flagged as critical  -->
-            <DataTemplate x:Key="CriticalContextMenuViewModelTemplate" x:DataType="viewmodels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="32" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <cpcontrols:IconBox
-                        Width="16"
-                        Height="16"
-                        Margin="4,0,0,0"
-                        HorizontalAlignment="Left"
-                        Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                        SourceKey="{x:Bind Icon, Mode=OneWay}"
-                        SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                    <TextBlock
-                        Grid.Column="1"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
-                        Text="{x:Bind Title, Mode=OneWay}" />
-                    <TextBlock
-                        Grid.Column="2"
-                        Margin="16,0,0,0"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource ContextItemCaptionTextBlockCriticalStyle}"
-                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
-                </Grid>
-            </DataTemplate>
-
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -274,7 +237,7 @@
                                 Margin="-16,-12,-16,-12"
                                 IsItemClickEnabled="True"
                                 ItemClick="CommandsDropdown_ItemClick"
-                                ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
+                                ItemTemplate="{StaticResource ContextMenuViewModelTemplate}"
                                 ItemsSource="{x:Bind ViewModel.ContextMenu.FilteredItems, Mode=OneWay}"
                                 KeyDown="CommandsDropdown_KeyDown"
                                 SelectionMode="Single">

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

@@ -5,9 +5,7 @@
 using AdaptiveCards.ObjectModel.WinUI3;
 using AdaptiveCards.Rendering.WinUI3;
 using Microsoft.CmdPal.UI.ViewModels;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 
 namespace Microsoft.CmdPal.UI.Controls;
 
@@ -98,65 +96,11 @@ public sealed partial class ContentFormControl : UserControl
         if (_renderedCard.FrameworkElement != null)
         {
             ContentGrid.Children.Add(_renderedCard.FrameworkElement);
-
-            // Use the Loaded event to ensure we focus after the card is in the visual tree
-            _renderedCard.FrameworkElement.Loaded += OnFrameworkElementLoaded;
         }
 
         _renderedCard.Action += Rendered_Action;
     }
 
-    private void OnFrameworkElementLoaded(object sender, RoutedEventArgs e)
-    {
-        // Unhook the event handler to avoid multiple registrations
-        if (sender is FrameworkElement element)
-        {
-            element.Loaded -= OnFrameworkElementLoaded;
-
-            if (!ViewModel?.OnlyControlOnPage ?? true)
-            {
-                return;
-            }
-
-            // Focus on the first focusable element asynchronously to ensure the visual tree is fully built
-            element.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
-            {
-                var focusableElement = FindFirstFocusableElement(element);
-                focusableElement?.Focus(FocusState.Programmatic);
-            });
-        }
-    }
-
-    private Control? FindFirstFocusableElement(DependencyObject parent)
-    {
-        var childCount = VisualTreeHelper.GetChildrenCount(parent);
-
-        // Process children first (depth-first search)
-        for (var i = 0; i < childCount; i++)
-        {
-            var child = VisualTreeHelper.GetChild(parent, i);
-
-            // If the child is a focusable control like TextBox, ComboBox, etc.
-            if (child is Control control &&
-                control.IsEnabled &&
-                control.IsTabStop &&
-                control.Visibility == Visibility.Visible &&
-                control.AllowFocusOnInteraction)
-            {
-                return control;
-            }
-
-            // Recursively check children
-            var result = FindFirstFocusableElement(child);
-            if (result != null)
-            {
-                return result;
-            }
-        }
-
-        return null;
-    }
-
     private void Rendered_Action(RenderedAdaptiveCard sender, AdaptiveActionEventArgs args) =>
         ViewModel?.HandleSubmit(args.Action, args.Inputs.AsJson());
 }

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

@@ -1,21 +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.UI.ViewModels;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-
-namespace Microsoft.CmdPal.UI;
-
-internal sealed partial class ContextItemTemplateSelector : DataTemplateSelector
-{
-    public DataTemplate? Default { get; set; }
-
-    public DataTemplate? Critical { get; set; }
-
-    protected override DataTemplate? SelectTemplateCore(object item)
-    {
-        return ((CommandContextItemViewModel)item).IsCritical ? Critical : Default;
-    }
-}

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

@@ -18,8 +18,6 @@ public partial class DetailsDataTemplateSelector : DataTemplateSelector
 
     public DataTemplate? TagTemplate { get; set; }
 
-    public DataTemplate? CommandTemplate { get; set; }
-
     protected override DataTemplate? SelectTemplateCore(object item)
     {
         if (item is DetailsElementViewModel element)
@@ -29,7 +27,6 @@ public partial class DetailsDataTemplateSelector : DataTemplateSelector
             {
                 DetailsSeparatorViewModel => SeparatorTemplate,
                 DetailsLinkViewModel => LinkTemplate,
-                DetailsCommandsViewModel => CommandTemplate,
                 DetailsTagsViewModel => TagTemplate,
                 _ => null,
             };

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

@@ -0,0 +1,30 @@
+// 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.Data;
+
+namespace Microsoft.CmdPal.UI.Converters;
+
+public class PercentageToOpacityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        if (value is int percentage)
+        {
+            return percentage / 100.0;
+        }
+
+        return 1.0;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        if (value is double opacity)
+        {
+            return (int)(opacity * 100);
+        }
+
+        return 100;
+    }
+}

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml

@@ -6,6 +6,7 @@
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
+    xmlns:cpconverters="using:Microsoft.CmdPal.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
     xmlns:local="using:Microsoft.CmdPal.UI"
@@ -27,6 +28,8 @@
             EmptyValue="Collapsed"
             NotEmptyValue="Visible" />
 
+        <cpconverters:PercentageToOpacityConverter x:Key="PercentageToOpacityConverter" />
+
         <DataTemplate x:Key="TagTemplate" x:DataType="viewmodels:TagViewModel">
             <cpcontrols:Tag
                 AutomationProperties.Name="{x:Bind Text, Mode=OneWay}"
@@ -119,6 +122,9 @@
                     ItemTemplate="{StaticResource ListItemViewModelTemplate}"
                     ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
                     SelectionChanged="ItemsList_SelectionChanged">
+                    <ListView.Background>
+                        <SolidColorBrush Color="{ThemeResource SystemChromeMediumLowColor}" Opacity="{x:Bind ListBackgroundOpacity, Mode=OneWay, Converter={StaticResource PercentageToOpacityConverter}}" />
+                    </ListView.Background>
                     <ListView.ItemContainerTransitions>
                         <TransitionCollection />
                     </ListView.ItemContainerTransitions>

src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs

@@ -13,6 +13,7 @@ using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using System.ComponentModel;
 
 namespace Microsoft.CmdPal.UI;
 
@@ -20,8 +21,12 @@ public sealed partial class ListPage : Page,
     IRecipient<NavigateNextCommand>,
     IRecipient<NavigatePreviousCommand>,
     IRecipient<ActivateSelectedListItemMessage>,
-    IRecipient<ActivateSecondaryCommandMessage>
+    IRecipient<ActivateSecondaryCommandMessage>,
+    INotifyPropertyChanged
 {
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    private SettingsModel? _settings;
     private ListViewModel? ViewModel
     {
         get => (ListViewModel?)GetValue(ViewModelProperty);
@@ -37,6 +42,19 @@ public sealed partial class ListPage : Page,
         this.InitializeComponent();
         this.NavigationCacheMode = NavigationCacheMode.Disabled;
         this.ItemsList.Loaded += ItemsList_Loaded;
+        
+        _settings = App.Current.Services.GetService<SettingsModel>()!;
+        _settings.SettingsChanged += Settings_SettingsChanged;
+    }
+
+    public int ListBackgroundOpacity
+    {
+        get => _settings?.ListBackgroundOpacity ?? 100;
+    }
+
+    private void Settings_SettingsChanged(SettingsModel sender, object? args)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ListBackgroundOpacity)));
     }
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -78,6 +96,11 @@ public sealed partial class ListPage : Page,
             ViewModel.ItemsUpdated -= Page_ItemsUpdated;
         }
 
+        if (_settings != null)
+        {
+            _settings.SettingsChanged -= Settings_SettingsChanged;
+        }
+
         if (e.NavigationMode != NavigationMode.New)
         {
             ViewModel?.SafeCleanup();
@@ -96,8 +119,7 @@ public sealed partial class ListPage : Page,
     {
         if (e.ClickedItem is ListItemViewModel item)
         {
-            var settings = App.Current.Services.GetService<SettingsModel>()!;
-            if (settings.SingleClickActivates)
+            if (_settings!.SingleClickActivates)
             {
                 ViewModel?.InvokeItemCommand.Execute(item);
             }
@@ -113,8 +135,7 @@ public sealed partial class ListPage : Page,
     {
         if (ItemsList.SelectedItem is ListItemViewModel vm)
         {
-            var settings = App.Current.Services.GetService<SettingsModel>()!;
-            if (!settings.SingleClickActivates)
+            if (!_settings!.SingleClickActivates)
             {
                 ViewModel?.InvokeItemCommand.Execute(vm);
             }

src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TrayIconService.cs

@@ -1,212 +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;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.UI.ViewModels;
-using Microsoft.CmdPal.UI.ViewModels.Messages;
-using Microsoft.UI.Xaml;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.UI.Shell;
-using Windows.Win32.UI.WindowsAndMessaging;
-using WinRT.Interop;
-using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
-
-namespace Microsoft.CmdPal.UI.Helpers;
-
-[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Stylistically, window messages are WM_*")]
-[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1306:Field names should begin with lower-case letter", Justification = "Stylistically, window messages are WM_*")]
-internal sealed partial class TrayIconService
-{
-    private const uint MY_NOTIFY_ID = 1000;
-    private const uint WM_TRAY_ICON = PInvoke.WM_USER + 1;
-
-    private readonly SettingsModel _settingsModel;
-    private readonly uint WM_TASKBAR_RESTART;
-
-    private Window? _window;
-    private HWND _hwnd;
-    private WNDPROC? _originalWndProc;
-    private WNDPROC? _trayWndProc;
-    private NOTIFYICONDATAW? _trayIconData;
-    private DestroyIconSafeHandle? _largeIcon;
-    private DestroyMenuSafeHandle? _popupMenu;
-
-    public TrayIconService(SettingsModel settingsModel)
-    {
-        _settingsModel = settingsModel;
-
-        // TaskbarCreated is the message that's broadcast when explorer.exe
-        // restarts. We need to know when that happens to be able to bring our
-        // notification area icon back
-        WM_TASKBAR_RESTART = PInvoke.RegisterWindowMessage("TaskbarCreated");
-    }
-
-    public void SetupTrayIcon(bool? showSystemTrayIcon = null)
-    {
-        if (showSystemTrayIcon ?? _settingsModel.ShowSystemTrayIcon)
-        {
-            if (_window == null)
-            {
-                _window = new Window();
-                _hwnd = new HWND(WindowNative.GetWindowHandle(_window));
-
-                // LOAD BEARING: If you don't stick the pointer to HotKeyPrc into a
-                // member (and instead like, use a local), then the pointer we marshal
-                // into the WindowLongPtr will be useless after we leave this function,
-                // and our **WindProc will explode**.
-                _trayWndProc = WindowProc;
-                var hotKeyPrcPointer = Marshal.GetFunctionPointerForDelegate(_trayWndProc);
-                _originalWndProc = Marshal.GetDelegateForFunctionPointer<WNDPROC>(PInvoke.SetWindowLongPtr(_hwnd, WINDOW_LONG_PTR_INDEX.GWL_WNDPROC, hotKeyPrcPointer));
-            }
-
-            if (_trayIconData == null)
-            {
-                // We need to stash this handle, so it doesn't clean itself up. If
-                // explorer restarts, we'll come back through here, and we don't
-                // really need to re-load the icon in that case. We can just use
-                // the handle from the first time.
-                _largeIcon = GetAppIconHandle();
-                _trayIconData = new NOTIFYICONDATAW()
-                {
-                    cbSize = (uint)Marshal.SizeOf(typeof(NOTIFYICONDATAW)),
-                    hWnd = _hwnd,
-                    uID = MY_NOTIFY_ID,
-                    uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_MESSAGE | NOTIFY_ICON_DATA_FLAGS.NIF_ICON | NOTIFY_ICON_DATA_FLAGS.NIF_TIP,
-                    uCallbackMessage = WM_TRAY_ICON,
-                    hIcon = (HICON)_largeIcon.DangerousGetHandle(),
-                    szTip = RS_.GetString("AppStoreName"),
-                };
-            }
-
-            var d = (NOTIFYICONDATAW)_trayIconData;
-
-            // Add the notification icon
-            PInvoke.Shell_NotifyIcon(NOTIFY_ICON_MESSAGE.NIM_ADD, in d);
-
-            if (_popupMenu == null)
-            {
-                _popupMenu = PInvoke.CreatePopupMenu_SafeHandle();
-                PInvoke.InsertMenu(_popupMenu, 0, MENU_ITEM_FLAGS.MF_BYPOSITION | MENU_ITEM_FLAGS.MF_STRING, PInvoke.WM_USER + 1, RS_.GetString("TrayMenu_Settings"));
-                PInvoke.InsertMenu(_popupMenu, 1, MENU_ITEM_FLAGS.MF_BYPOSITION | MENU_ITEM_FLAGS.MF_STRING, PInvoke.WM_USER + 2, RS_.GetString("TrayMenu_Exit"));
-            }
-        }
-        else
-        {
-            Destroy();
-        }
-    }
-
-    public void Destroy()
-    {
-        if (_trayIconData != null)
-        {
-            var d = (NOTIFYICONDATAW)_trayIconData;
-            if (PInvoke.Shell_NotifyIcon(NOTIFY_ICON_MESSAGE.NIM_DELETE, in d))
-            {
-                _trayIconData = null;
-            }
-        }
-
-        if (_popupMenu != null)
-        {
-            _popupMenu.Close();
-            _popupMenu = null;
-        }
-
-        if (_largeIcon != null)
-        {
-            _largeIcon.Close();
-            _largeIcon = null;
-        }
-
-        if (_window != null)
-        {
-            _window.Close();
-            _window = null;
-            _hwnd = HWND.Null;
-        }
-    }
-
-    private DestroyIconSafeHandle GetAppIconHandle()
-    {
-        var exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
-        DestroyIconSafeHandle largeIcon;
-        PInvoke.ExtractIconEx(exePath, 0, out largeIcon, out _, 1);
-        return largeIcon;
-    }
-
-    private LRESULT WindowProc(
-        HWND hwnd,
-        uint uMsg,
-        WPARAM wParam,
-        LPARAM lParam)
-    {
-        switch (uMsg)
-        {
-            case PInvoke.WM_COMMAND:
-                {
-                    if (wParam == PInvoke.WM_USER + 1)
-                    {
-                        WeakReferenceMessenger.Default.Send<OpenSettingsMessage>();
-                    }
-                    else if (wParam == PInvoke.WM_USER + 2)
-                    {
-                        WeakReferenceMessenger.Default.Send<QuitMessage>();
-                    }
-                }
-
-                break;
-
-            // Shell_NotifyIcon can fail when we invoke it during the time explorer.exe isn't present/ready to handle it.
-            // We'll also never receive WM_TASKBAR_RESTART message if the first call to Shell_NotifyIcon failed, so we use
-            // WM_WINDOWPOSCHANGING which is always received on explorer startup sequence.
-            case PInvoke.WM_WINDOWPOSCHANGING:
-                {
-                    if (_trayIconData == null)
-                    {
-                        SetupTrayIcon();
-                    }
-                }
-
-                break;
-            default:
-                // WM_TASKBAR_RESTART isn't a compile-time constant, so we can't
-                // use it in a case label
-                if (uMsg == WM_TASKBAR_RESTART)
-                {
-                    // Handle the case where explorer.exe restarts.
-                    // Even if we created it before, do it again
-                    SetupTrayIcon();
-                }
-                else if (uMsg == WM_TRAY_ICON)
-                {
-                    switch ((uint)lParam.Value)
-                    {
-                        case PInvoke.WM_RBUTTONUP:
-                            {
-                                if (_popupMenu != null)
-                                {
-                                    PInvoke.GetCursorPos(out var cursorPos);
-                                    PInvoke.SetForegroundWindow(_hwnd);
-                                    PInvoke.TrackPopupMenuEx(_popupMenu, (uint)TRACK_POPUP_MENU_FLAGS.TPM_LEFTALIGN | (uint)TRACK_POPUP_MENU_FLAGS.TPM_BOTTOMALIGN, cursorPos.X, cursorPos.Y, _hwnd, null);
-                                }
-                            }
-
-                            break;
-                        case PInvoke.WM_LBUTTONUP:
-                        case PInvoke.WM_LBUTTONDBLCLK:
-                            WeakReferenceMessenger.Default.Send<HotkeySummonMessage>(new(string.Empty, HWND.Null));
-                            break;
-                    }
-                }
-
-                break;
-        }
-
-        return PInvoke.CallWindowProc(_originalWndProc, hwnd, uMsg, wParam, lParam);
-    }
-}

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

@@ -29,6 +29,7 @@ using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.UI.Input.KeyboardAndMouse;
+using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
 using WinRT;
 using WinUIEx;
@@ -46,9 +47,23 @@ public sealed partial class MainWindow : WindowEx,
     private readonly WNDPROC? _hotkeyWndProc;
     private readonly WNDPROC? _originalWndProc;
     private readonly List<TopLevelHotkey> _hotkeys = [];
-    private readonly KeyboardListener _keyboardListener;
     private bool _ignoreHotKeyWhenFullScreen = true;
 
+    // Stylistically, window messages are WM_*
+#pragma warning disable SA1310 // Field names should not contain underscore
+#pragma warning disable SA1306 // Field names should begin with lower-case letter
+    private const uint MY_NOTIFY_ID = 1000;
+    private const uint WM_TRAY_ICON = PInvoke.WM_USER + 1;
+    private readonly uint WM_TASKBAR_RESTART;
+#pragma warning restore SA1306 // Field names should begin with lower-case letter
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    private readonly KeyboardListener _keyboardListener;
+
+    // Notification Area ("Tray") icon data
+    private NOTIFYICONDATAW? _trayIconData;
+    private DestroyIconSafeHandle? _largeIcon;
+
     private DesktopAcrylicController? _acrylicController;
     private SystemBackdropConfiguration? _configurationSource;
 
@@ -64,6 +79,11 @@ public sealed partial class MainWindow : WindowEx,
 
         _keyboardListener.SetProcessCommand(new CmdPalKeyboardService.ProcessCommand(HandleSummon));
 
+        // TaskbarCreated is the message that's broadcast when explorer.exe
+        // restarts. We need to know when that happens to be able to bring our
+        // notification area icon back
+        WM_TASKBAR_RESTART = PInvoke.RegisterWindowMessage("TaskbarCreated");
+
         this.SetIcon();
         AppWindow.Title = RS_.GetString("AppName");
         PositionCentered();
@@ -139,7 +159,7 @@ public sealed partial class MainWindow : WindowEx,
         var settings = App.Current.Services.GetService<SettingsModel>()!;
 
         SetupHotkey(settings);
-        App.Current.Services.GetService<TrayIconService>()!.SetupTrayIcon(settings.ShowSystemTrayIcon);
+        SetupTrayIcon(settings.ShowSystemTrayIcon);
 
         _ignoreHotKeyWhenFullScreen = settings.IgnoreShortcutWhenFullscreen;
 
@@ -199,7 +219,7 @@ public sealed partial class MainWindow : WindowEx,
 
     private void ShowHwnd(IntPtr hwndValue, MonitorBehavior target)
     {
-        var hwnd = new HWND(hwndValue != 0 ? hwndValue : _hwnd);
+        var hwnd = new HWND(hwndValue);
 
         // Remember, IsIconic == "minimized", which is entirely different state
         // from "show/hide"
@@ -312,7 +332,7 @@ public sealed partial class MainWindow : WindowEx,
         var extensionService = serviceProvider.GetService<IExtensionService>()!;
         extensionService.SignalStopExtensionsAsync();
 
-        App.Current.Services.GetService<TrayIconService>()!.Destroy();
+        RemoveTrayIcon();
 
         // WinUI bug is causing a crash on shutdown when FailFastOnErrors is set to true (#51773592).
         // Workaround by turning it off before shutdown.
@@ -320,7 +340,6 @@ public sealed partial class MainWindow : WindowEx,
         DisposeAcrylic();
 
         _keyboardListener.Stop();
-        Environment.Exit(0);
     }
 
     private void DisposeAcrylic()
@@ -496,27 +515,18 @@ public sealed partial class MainWindow : WindowEx,
 
             if (key != null)
             {
-                if (settings.UseLowLevelGlobalHotkey)
-                {
-                    _keyboardListener.SetHotkeyAction(key.Win, key.Ctrl, key.Shift, key.Alt, (byte)key.Code, commandHotkey.CommandId);
+                var vk = key.Code;
+                var modifiers =
+                    (key.Alt ? HOT_KEY_MODIFIERS.MOD_ALT : 0) |
+                    (key.Ctrl ? HOT_KEY_MODIFIERS.MOD_CONTROL : 0) |
+                    (key.Shift ? HOT_KEY_MODIFIERS.MOD_SHIFT : 0) |
+                    (key.Win ? HOT_KEY_MODIFIERS.MOD_WIN : 0)
+                    ;
 
-                    _hotkeys.Add(new(globalHotkey, string.Empty));
-                }
-                else
+                var success = PInvoke.RegisterHotKey(_hwnd, _hotkeys.Count, modifiers, (uint)vk);
+                if (success)
                 {
-                    var vk = key.Code;
-                    var modifiers =
-                        (key.Alt ? HOT_KEY_MODIFIERS.MOD_ALT : 0) |
-                        (key.Ctrl ? HOT_KEY_MODIFIERS.MOD_CONTROL : 0) |
-                        (key.Shift ? HOT_KEY_MODIFIERS.MOD_SHIFT : 0) |
-                        (key.Win ? HOT_KEY_MODIFIERS.MOD_WIN : 0)
-                        ;
-
-                    var success = PInvoke.RegisterHotKey(_hwnd, _hotkeys.Count, modifiers, (uint)vk);
-                    if (success)
-                    {
-                        _hotkeys.Add(commandHotkey);
-                    }
+                    _hotkeys.Add(commandHotkey);
                 }
             }
         }
@@ -596,8 +606,100 @@ public sealed partial class MainWindow : WindowEx,
 
                     return (LRESULT)IntPtr.Zero;
                 }
+
+            // Shell_NotifyIcon can fail when we invoke it during the time explorer.exe isn't present/ready to handle it.
+            // We'll also never receive WM_TASKBAR_RESTART message if the first call to Shell_NotifyIcon failed, so we use
+            // WM_WINDOWPOSCHANGING which is always received on explorer startup sequence.
+            case PInvoke.WM_WINDOWPOSCHANGING:
+                {
+                    if (_trayIconData == null)
+                    {
+                        SetupTrayIcon();
+                    }
+                }
+
+                break;
+            default:
+                // WM_TASKBAR_RESTART isn't a compile-time constant, so we can't
+                // use it in a case label
+                if (uMsg == WM_TASKBAR_RESTART)
+                {
+                    // Handle the case where explorer.exe restarts.
+                    // Even if we created it before, do it again
+                    SetupTrayIcon();
+                }
+                else if (uMsg == WM_TRAY_ICON)
+                {
+                    switch ((uint)lParam.Value)
+                    {
+                        case PInvoke.WM_RBUTTONUP:
+                        case PInvoke.WM_LBUTTONUP:
+                        case PInvoke.WM_LBUTTONDBLCLK:
+                            Summon(string.Empty);
+                            break;
+                    }
+                }
+
+                break;
         }
 
         return PInvoke.CallWindowProc(_originalWndProc, hwnd, uMsg, wParam, lParam);
     }
+
+    private void SetupTrayIcon(bool? showSystemTrayIcon = null)
+    {
+        if (showSystemTrayIcon ?? App.Current.Services.GetService<SettingsModel>()!.ShowSystemTrayIcon)
+        {
+            // We only need to build the tray data once.
+            if (_trayIconData == null)
+            {
+                // We need to stash this handle, so it doesn't clean itself up. If
+                // explorer restarts, we'll come back through here, and we don't
+                // really need to re-load the icon in that case. We can just use
+                // the handle from the first time.
+                _largeIcon = GetAppIconHandle();
+                _trayIconData = new NOTIFYICONDATAW()
+                {
+                    cbSize = (uint)Marshal.SizeOf(typeof(NOTIFYICONDATAW)),
+                    hWnd = _hwnd,
+                    uID = MY_NOTIFY_ID,
+                    uFlags = NOTIFY_ICON_DATA_FLAGS.NIF_MESSAGE | NOTIFY_ICON_DATA_FLAGS.NIF_ICON | NOTIFY_ICON_DATA_FLAGS.NIF_TIP,
+                    uCallbackMessage = WM_TRAY_ICON,
+                    hIcon = (HICON)_largeIcon.DangerousGetHandle(),
+                    szTip = RS_.GetString("AppStoreName"),
+                };
+            }
+
+            var d = (NOTIFYICONDATAW)_trayIconData;
+
+            // Add the notification icon
+            PInvoke.Shell_NotifyIcon(NOTIFY_ICON_MESSAGE.NIM_ADD, in d);
+        }
+        else
+        {
+            RemoveTrayIcon();
+        }
+    }
+
+    private void RemoveTrayIcon()
+    {
+        if (_trayIconData != null)
+        {
+            var d = (NOTIFYICONDATAW)_trayIconData;
+            if (PInvoke.Shell_NotifyIcon(NOTIFY_ICON_MESSAGE.NIM_DELETE, in d))
+            {
+                _trayIconData = null;
+            }
+        }
+
+        _largeIcon?.Close();
+    }
+
+    private DestroyIconSafeHandle GetAppIconHandle()
+    {
+        var exePath = System.Reflection.Assembly.GetExecutingAssembly().Location;
+        DestroyIconSafeHandle largeIcon;
+        PInvoke.ExtractIconEx(exePath, 0, out largeIcon, out _, 1);
+        return largeIcon;
+    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj

@@ -39,7 +39,9 @@
   </PropertyGroup>
 
   <!-- BODGY: XES Versioning and WinAppSDK get into a fight about the app manifest, which breaks WinAppSDK. -->
-  <Target Name="RearrangeXefVersioningAndWinAppSDKResourceGeneration" DependsOnTargets="GetNewAppManifestValues;CreateWinRTRegistration" BeforeTargets="XesWriteVersionInfoResourceFile">
+  <Target Name="RearrangeXefVersioningAndWinAppSDKResourceGeneration"
+          DependsOnTargets="GetNewAppManifestValues;CreateWinRTRegistration"
+          BeforeTargets="XesWriteVersionInfoResourceFile">
     <PropertyGroup>
       <!-- XES uses this property to store the "final" location of the app manifest, before it erases it.
            We have to update it to the value WinAppSDK set it to. -->

src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt

@@ -35,14 +35,9 @@ WM_WINDOWPOSCHANGING
 RegisterWindowMessageW
 GetModuleHandleW
 ExtractIconEx
-TRACK_POPUP_MENU_FLAGS
-WM_COMMAND
 WM_RBUTTONUP
 WM_LBUTTONUP
 WM_LBUTTONDBLCLK
-CreatePopupMenu
-TrackPopupMenuEx
-InsertMenu
 
 MessageBox
 DwmGetWindowAttribute

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml

@@ -29,7 +29,6 @@
 
             <cmdpalUI:DetailsDataTemplateSelector
                 x:Key="DetailsDataTemplateSelector"
-                CommandTemplate="{StaticResource DetailsCommandsTemplate}"
                 LinkTemplate="{StaticResource DetailsLinkTemplate}"
                 SeparatorTemplate="{StaticResource DetailsSeparatorTemplate}"
                 TagTemplate="{StaticResource DetailsTagsTemplate}" />
@@ -51,27 +50,6 @@
                     ToolTipService.ToolTip="{x:Bind ToolTip, Mode=OneWay}" />
             </DataTemplate>
 
-            <DataTemplate x:Key="CommandTemplate" x:DataType="viewModels:CommandViewModel">
-                <StackPanel Orientation="Vertical">
-                    <Button
-                        Name="Command"
-                        HorizontalAlignment="Stretch"
-                        HorizontalContentAlignment="Left"
-                        Click="Command_Click"
-                        Style="{StaticResource SubtleButtonStyle}">
-                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
-                            <cpcontrols:IconBox
-                                Width="16"
-                                Height="16"
-                                Margin="0,3,8,0"
-                                SourceKey="{x:Bind Icon, Mode=OneWay}"
-                                SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                            <TextBlock Text="{x:Bind Name}" />
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
-            </DataTemplate>
-
             <DataTemplate x:Key="DetailsLinkTemplate" x:DataType="viewModels:DetailsLinkViewModel">
                 <StackPanel Orientation="Vertical">
                     <TextBlock
@@ -93,18 +71,6 @@
                         Visibility="{x:Bind IsLink, Mode=OneWay}" />
                 </StackPanel>
             </DataTemplate>
-            <DataTemplate x:Key="DetailsCommandsTemplate" x:DataType="viewModels:DetailsCommandsViewModel">
-                <StackPanel Orientation="Vertical" Spacing="4">
-                    <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
-                    <ItemsControl
-                        ItemTemplate="{StaticResource CommandTemplate}"
-                        ItemsSource="{x:Bind Commands, Mode=OneWay}"
-                        Visibility="{x:Bind HasCommands, Mode=OneWay}" />
-                </StackPanel>
-            </DataTemplate>
             <DataTemplate x:Key="DetailsSeparatorTemplate" x:DataType="viewModels:DetailsSeparatorViewModel">
                 <StackPanel Margin="0,8,8,0" Orientation="Vertical">
                     <Border

src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs

@@ -629,12 +629,4 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             return iconInfoVM?.HasIcon(requestedTheme == Microsoft.UI.Xaml.ElementTheme.Light) ?? false;
         }
     }
-
-    private void Command_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
-    {
-        if (sender is Button button && button.DataContext is CommandViewModel commandViewModel)
-        {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(commandViewModel.Model));
-        }
-    }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml

@@ -84,6 +84,16 @@
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
+                    <TextBlock x:Uid="AppearanceSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
+
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_ListBackgroundOpacity_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xF12F;}">
+                        <Slider
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            Maximum="100"
+                            Minimum="0"
+                            Value="{x:Bind viewModel.ListBackgroundOpacity, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                     <!--  Example 'About' section  -->
                     <TextBlock x:Uid="AboutSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw

@@ -229,6 +229,18 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>About</value>
     <comment>A section header for information about the app</comment>
   </data>
+  <data name="AppearanceSettingsHeader.Text" xml:space="preserve">
+    <value>Appearance</value>
+    <comment>A section header for appearance-related settings</comment>
+  </data>
+  <data name="Settings_GeneralPage_ListBackgroundOpacity_SettingsCard.Header" xml:space="preserve">
+    <value>List background opacity</value>
+    <comment>Header for a setting that controls the opacity of the results list background</comment>
+  </data>
+  <data name="Settings_GeneralPage_ListBackgroundOpacity_SettingsCard.Description" xml:space="preserve">
+    <value>Make the results list background more or less transparent</value>
+    <comment>Description for the list background opacity setting</comment>
+  </data>
   <data name="ExtensionAboutHeader.Text" xml:space="preserve">
     <value>About</value>
     <comment>A section header for information about the app</comment>
@@ -412,10 +424,4 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>
   </data>
-  <data name="TrayMenu_Settings" xml:space="preserve">
-    <value>Settings</value>
-  </data>
-  <data name="TrayMenu_Exit" xml:space="preserve">
-    <value>Exit</value>
-  </data>
 </root>

src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/TextBlock.xaml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converters="using:CommunityToolkit.WinUI.Converters">
-
-    <ResourceDictionary.MergedDictionaries>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-        <!--  Other merged dictionaries here  -->
-    </ResourceDictionary.MergedDictionaries>
-
-    <Style
-        x:Key="ContextItemTitleTextBlockCriticalStyle"
-        BasedOn="{StaticResource BaseTextBlockStyle}"
-        TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
-        <Setter Property="FontWeight" Value="Normal" />
-    </Style>
-
-    <Style
-        x:Key="ContextItemCaptionTextBlockCriticalStyle"
-        BasedOn="{StaticResource CaptionTextBlockStyle}"
-        TargetType="TextBlock">
-        <Setter Property="Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
-    </Style>
-
-</ResourceDictionary>

src/modules/cmdpal/README.md

@@ -1,6 +1,6 @@
 # ![cmdpal logo](./Microsoft.CmdPal.UI/Assets/Stable/StoreLogo.scale-100.png) Command Palette
 
-Windows Command Palette ("CmdPal") is the next iteration of PowerToys Run. With extensibility at its core, the Command Palette is your one-stop launcher to start _anything_.
+Windows Command Palette ("CmdPal") is the next iteration of PowerToys Run. With extensibility at it's core, the Command Palette is your one-stop launcher to start _anything_.
 
 By default, CmdPal is bound to <kbd>Win+Alt+Space</kbd>. 
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs

@@ -71,7 +71,7 @@ public class AllAppsSettings : JsonSettingsManager
 
     internal static string SettingsJsonPath()
     {
-        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        string directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
 
         // now, the state is just next to the exe

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs

@@ -8,12 +8,7 @@ using System.Threading.Tasks;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Services.Maps;
-using Windows.Win32;
-using Windows.Win32.System.Com;
-using Windows.Win32.UI.Shell;
 using WyHash;
 
 namespace Microsoft.CmdPal.Ext.Apps;
@@ -32,31 +27,26 @@ internal sealed partial class AppCommand : InvokableCommand
 
     internal static async Task StartApp(string aumid)
     {
+        var appManager = new ApplicationActivationManager();
+        const ActivateOptions noFlags = ActivateOptions.None;
         await Task.Run(() =>
         {
-            unsafe
+            try
             {
-                IApplicationActivationManager* appManager = null;
-                try
-                {
-                    PInvoke.CoCreateInstance(typeof(ApplicationActivationManager).GUID, null, CLSCTX.CLSCTX_INPROC_SERVER, out appManager).ThrowOnFailure();
-                    using var handle = new SafeComHandle((IntPtr)appManager);
-                    appManager->ActivateApplication(
-                        aumid,
-                        string.Empty,
-                        ACTIVATEOPTIONS.AO_NONE,
-                        out var unusedPid);
-                }
-                catch (System.Exception ex)
-                {
-                    Logger.LogError(ex.Message);
-                }
+                appManager.ActivateApplication(aumid, /*queryArguments*/ string.Empty, noFlags, out var unusedPid);
+            }
+            catch (System.Exception ex)
+            {
+                Logger.LogError(ex.Message);
             }
         }).ConfigureAwait(false);
     }
 
     internal static async Task StartExe(string path)
     {
+        var appManager = new ApplicationActivationManager();
+
+        // const ActivateOptions noFlags = ActivateOptions.None;
         await Task.Run(() =>
         {
             try

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj

@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Apps</RootNamespace>
     <Nullable>enable</Nullable>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-	<DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
   </PropertyGroup>
 
   <ItemGroup>
@@ -51,9 +49,4 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
-  <ItemGroup>
-    <AdditionalFiles Include="NativeMethods.txt" />
-    <AdditionalFiles Include="NativeMethods.json" />
-  </ItemGroup>
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.json

@@ -1,7 +0,0 @@
-{
-  "$schema": "https://aka.ms/CsWin32.schema.json",
-  "allowMarshaling": false,
-  "comInterop": {
-    "preserveSigMethods": [ "*" ]
-  }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/NativeMethods.txt

@@ -1,20 +1,19 @@
-IStream
+GetPhysicallyInstalledSystemMemory
+GlobalMemoryStatusEx
+GetSystemInfo
 CoCreateInstance
-IApplicationActivationManager
-ApplicationActivationManager
+SetForegroundWindow
+IsIconic
+RegisterHotKey
+SetWindowLongPtr
+CallWindowProc
+ShowWindow
+SetForegroundWindow
+SetFocus
+SetActiveWindow
+MonitorFromWindow
+GetMonitorInfo
 SHCreateStreamOnFileEx
-SHCreateItemFromParsingName
-IShellItem
-ISequentialStream
-SHLoadIndirectString
-IAppxFactory
-AppxFactory
-IAppxManifestReader
-IAppxManifestApplicationsEnumerator
-IAppxManifestApplication
-IAppxManifestProperties
-IShellLinkW
-ShellLink
-IPersistFile
-CoTaskMemFree
-IUnknown
+CoAllowSetForegroundWindow
+SHCreateStreamOnFileEx
+SHLoadIndirectString

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxFactory.cs

@@ -0,0 +1,14 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+// Reference : https://stackoverflow.com/questions/32122679/getting-icon-of-modern-windows-app-from-a-desktop-application
+[Guid("5842a140-ff9f-4166-8f5c-62f5b7b0c781")]
+[ComImport]
+public class AppxFactory
+{
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/AppxPackageHelper.cs

@@ -2,75 +2,42 @@
 // 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 ManagedCommon;
-using Microsoft.CmdPal.Ext.Apps.Utils;
-using Microsoft.UI.Xaml.Controls;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
+using System.Runtime.InteropServices;
 using Windows.Win32.System.Com;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 
 namespace Microsoft.CmdPal.Ext.Apps.Programs;
 
 public static class AppxPackageHelper
 {
-    internal static unsafe List<IntPtr> GetAppsFromManifest(IStream* stream)
+    private static readonly IAppxFactory AppxFactory = (IAppxFactory)new AppxFactory();
+
+    // This function returns a list of attributes of applications
+    internal static IEnumerable<IAppxManifestApplication> GetAppsFromManifest(IStream stream)
     {
-        PInvoke.CoCreateInstance(typeof(AppxFactory).GUID, null, CLSCTX.CLSCTX_INPROC_SERVER, out IAppxFactory* appxFactory).ThrowOnFailure();
-        using var handle = new SafeComHandle((IntPtr)appxFactory);
+        var reader = AppxFactory.CreateManifestReader(stream);
+        var manifestApps = reader.GetApplications();
 
-        IAppxManifestReader* reader = null;
-        IAppxManifestApplicationsEnumerator* manifestApps = null;
-        var result = new List<IntPtr>();
-
-        appxFactory->CreateManifestReader(stream, &reader);
-        using var readerHandle = new SafeComHandle((IntPtr)reader);
-        reader->GetApplications(&manifestApps);
-        using var manifestAppsHandle = new SafeComHandle((IntPtr)manifestApps);
-
-        while (true)
+        while (manifestApps.GetHasCurrent())
         {
-            manifestApps->GetHasCurrent(out var hasCurrent);
-            if (hasCurrent == false)
+            var manifestApp = manifestApps.GetCurrent();
+            var hr = manifestApp.GetStringValue("AppListEntry", out var appListEntry);
+            _ = CheckHRAndReturnOrThrow(hr, appListEntry);
+            if (appListEntry != "none")
             {
-                break;
+                yield return manifestApp;
             }
 
-            IAppxManifestApplication* manifestApp = null;
+            manifestApps.MoveNext();
+        }
+    }
 
-            try
-            {
-                manifestApps->GetCurrent(&manifestApp).ThrowOnFailure();
-
-                var hr = manifestApp->GetStringValue("AppListEntry", out var appListEntryPtr);
-                var appListEntry = ComFreeHelper.GetStringAndFree(hr, appListEntryPtr);
-
-                if (appListEntry != "none")
-                {
-                    result.Add((IntPtr)manifestApp);
-                }
-                else if (manifestApp != null)
-                {
-                    manifestApp->Release();
-                }
-            }
-            catch (Exception ex)
-            {
-                if (manifestApp != null)
-                {
-                    manifestApp->Release();
-                }
-
-                Logger.LogError($"Failed to get current application from manifest: {ex.Message}");
-            }
-
-            manifestApps->MoveNext(out var hasNext);
-            if (hasNext == false)
-            {
-                break;
-            }
+    internal static T CheckHRAndReturnOrThrow<T>(HRESULT hr, T result)
+    {
+        if (hr != HRESULT.S_OK)
+        {
+            Marshal.ThrowExceptionForHR((int)hr);
         }
 
         return result;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IApplicationActivationManager.cs

@@ -0,0 +1,47 @@
+// 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.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+// Reference : https://github.com/MicrosoftEdge/edge-launcher/blob/108e63df0b4cb5cd9d5e45aa7a264690851ec51d/MIcrosoftEdgeLauncherCsharp/Program.cs
+[Flags]
+public enum ActivateOptions
+{
+    None = 0x00000000,
+    DesignMode = 0x00000001,
+    NoErrorUI = 0x00000002,
+    NoSplashScreen = 0x00000004,
+}
+
+// ApplicationActivationManager
+[ComImport]
+[Guid("2e941141-7f97-4756-ba1d-9decde894a3d")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IApplicationActivationManager
+{
+    IntPtr ActivateApplication([In] string appUserModelId, [In] string arguments, [In] ActivateOptions options, [Out] out uint processId);
+
+    IntPtr ActivateForFile([In] string appUserModelId, [In] IntPtr /*IShellItemArray* */ itemArray, [In] string verb, [Out] out uint processId);
+
+    IntPtr ActivateForProtocol([In] string appUserModelId, [In] IntPtr /* IShellItemArray* */itemArray, [Out] out uint processId);
+}
+
+// Application Activation Manager Class
+[ComImport]
+[Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")]
+public class ApplicationActivationManager : IApplicationActivationManager
+{
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)/*, PreserveSig*/]
+    public extern IntPtr ActivateApplication([In] string appUserModelId, [In] string arguments, [In] ActivateOptions options, [Out] out uint processId);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public extern IntPtr ActivateForFile([In] string appUserModelId, [In] IntPtr /*IShellItemArray* */ itemArray, [In] string verb, [Out] out uint processId);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public extern IntPtr ActivateForProtocol([In] string appUserModelId, [In] IntPtr /* IShellItemArray* */itemArray, [Out] out uint processId);
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxFactory.cs

@@ -0,0 +1,20 @@
+// 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.Runtime.InteropServices;
+using Windows.Win32.System.Com;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("BEB94909-E451-438B-B5A7-D79E767B75D8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxFactory
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap0_2(); // skip 2 methods
+
+    internal IAppxManifestReader CreateManifestReader(IStream inputStream);
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplication.cs

@@ -0,0 +1,19 @@
+// 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.Runtime.InteropServices;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("5DA89BF4-3773-46BE-B650-7E744863B7E8")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestApplication
+{
+    [PreserveSig]
+    HRESULT GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string value);
+
+    [PreserveSig]
+    HRESULT GetAppUserModelId([MarshalAs(UnmanagedType.LPWStr)] out string value);
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestApplicationsEnumerator.cs

@@ -0,0 +1,19 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("9EB8A55A-F04B-4D0D-808D-686185D4847A")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestApplicationsEnumerator
+{
+    IAppxManifestApplication GetCurrent();
+
+    bool GetHasCurrent();
+
+    bool MoveNext();
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestProperties.cs

@@ -0,0 +1,19 @@
+// 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.Runtime.InteropServices;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("03FAF64D-F26F-4B2C-AAF7-8FE7789B8BCA")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestProperties
+{
+    [PreserveSig]
+    HRESULT GetBoolValue([MarshalAs(UnmanagedType.LPWStr)] string name, out bool value);
+
+    [PreserveSig]
+    HRESULT GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string value);
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/IAppxManifestReader.cs

@@ -0,0 +1,27 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Apps.Programs;
+
+[Guid("4E1BD148-55A0-4480-A3D1-15544710637C")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAppxManifestReader
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap0_1(); // skip 1 method
+
+    IAppxManifestProperties GetProperties();
+
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Implements COM Interface")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    void _VtblGap1_5(); // skip 5 methods
+
+    IAppxManifestApplicationsEnumerator GetApplications();
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/ReparsePoint.cs

@@ -5,7 +5,6 @@
 using System;
 using System.ComponentModel;
 using System.IO;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -17,7 +16,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Programs;
 /// <summary>
 /// Provides access to NTFS reparse points in .Net.
 /// </summary>
-public static partial class ReparsePoint
+public static class ReparsePoint
 {
 #pragma warning disable SA1310 // Field names should not contain underscore
 
@@ -37,7 +36,7 @@ public static partial class ReparsePoint
 #pragma warning restore SA1310 // Field names should not contain underscore
 
     [Flags]
-    internal enum FileAccessType : uint
+    private enum FileAccessType : uint
     {
         DELETE = 0x00010000,
         READ_CONTROL = 0x00020000,
@@ -101,7 +100,7 @@ public static partial class ReparsePoint
     }
 
     [Flags]
-    internal enum FileShareType : uint
+    private enum FileShareType : uint
     {
         None = 0x00000000,
         Read = 0x00000001,
@@ -109,7 +108,7 @@ public static partial class ReparsePoint
         Delete = 0x00000004,
     }
 
-    internal enum CreationDisposition : uint
+    private enum CreationDisposition : uint
     {
         New = 1,
         CreateAlways = 2,
@@ -119,7 +118,7 @@ public static partial class ReparsePoint
     }
 
     [Flags]
-    internal enum FileAttributes : uint
+    private enum FileAttributes : uint
     {
         Readonly = 0x00000001,
         Hidden = 0x00000002,
@@ -196,9 +195,8 @@ public static partial class ReparsePoint
         public AppExecutionAliasReparseTagBufferLayoutVersion Version;
     }
 
-    [LibraryImport("kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    internal static partial bool DeviceIoControl(
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    private static extern bool DeviceIoControl(
         IntPtr hDevice,
         uint dwIoControlCode,
         IntPtr inBuffer,
@@ -208,8 +206,8 @@ public static partial class ReparsePoint
         out int pBytesReturned,
         IntPtr lpOverlapped);
 
-    [LibraryImport("kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-    internal static partial int CreateFile(
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+    private static extern IntPtr CreateFile(
         string lpFileName,
         FileAccessType dwDesiredAccess,
         FileShareType dwShareMode,
@@ -286,18 +284,15 @@ public static partial class ReparsePoint
                         ThrowLastWin32Error("Unable to get information about reparse point.");
                     }
 
-                    unsafe
+                    AppExecutionAliasReparseTagHeader aliasReparseHeader = Marshal.PtrToStructure<AppExecutionAliasReparseTagHeader>(outBuffer);
+
+                    if (aliasReparseHeader.ReparseTag == IO_REPARSE_TAG_APPEXECLINK)
                     {
-                        var aliasReparseHeader = Unsafe.Read<AppExecutionAliasReparseTagHeader>((void*)outBuffer);
+                        var metadata = AppExecutionAliasMetadata.FromPersistedRepresentationIntPtr(
+                            outBuffer,
+                            aliasReparseHeader.Version);
 
-                        if (aliasReparseHeader.ReparseTag == IO_REPARSE_TAG_APPEXECLINK)
-                        {
-                            var metadata = AppExecutionAliasMetadata.FromPersistedRepresentationIntPtr(
-                                outBuffer,
-                                aliasReparseHeader.Version);
-
-                            return metadata.ExePath;
-                        }
+                        return metadata.ExePath;
                     }
 
                     return null;
@@ -324,65 +319,61 @@ public static partial class ReparsePoint
 
         public static AppExecutionAliasMetadata FromPersistedRepresentationIntPtr(IntPtr reparseDataBufferPtr, AppExecutionAliasReparseTagBufferLayoutVersion version)
         {
-            unsafe
+            var dataOffset = Marshal.SizeOf<AppExecutionAliasReparseTagHeader>();
+            var dataBufferPtr = reparseDataBufferPtr + dataOffset;
+
+            string? packageFullName = null;
+            string? packageFamilyName = null;
+            string? aumid = null;
+            string? exePath = null;
+
+            VerifyVersion(version);
+
+            switch (version)
             {
-                var dataOffset = Unsafe.SizeOf<AppExecutionAliasReparseTagHeader>();
+                case AppExecutionAliasReparseTagBufferLayoutVersion.Initial:
+                    packageFullName = Marshal.PtrToStringUni(dataBufferPtr);
+                    if (packageFullName is not null)
+                    {
+                        dataBufferPtr += Encoding.Unicode.GetByteCount(packageFullName) + Encoding.Unicode.GetByteCount("\0");
+                        aumid = Marshal.PtrToStringUni(dataBufferPtr);
 
-                var dataBufferPtr = reparseDataBufferPtr + dataOffset;
-
-                string? packageFullName = null;
-                string? packageFamilyName = null;
-                string? aumid = null;
-                string? exePath = null;
-
-                VerifyVersion(version);
-
-                switch (version)
-                {
-                    case AppExecutionAliasReparseTagBufferLayoutVersion.Initial:
-                        packageFullName = Marshal.PtrToStringUni(dataBufferPtr);
-                        if (packageFullName is not null)
+                        if (aumid is not null)
                         {
-                            dataBufferPtr += Encoding.Unicode.GetByteCount(packageFullName) + Encoding.Unicode.GetByteCount("\0");
-                            aumid = Marshal.PtrToStringUni(dataBufferPtr);
-
-                            if (aumid is not null)
-                            {
-                                dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
-                                exePath = Marshal.PtrToStringUni(dataBufferPtr);
-                            }
+                            dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
+                            exePath = Marshal.PtrToStringUni(dataBufferPtr);
                         }
+                    }
 
-                        break;
+                    break;
 
-                    case AppExecutionAliasReparseTagBufferLayoutVersion.PackageFamilyName:
-                    case AppExecutionAliasReparseTagBufferLayoutVersion.MultiAppTypeSupport:
-                        packageFamilyName = Marshal.PtrToStringUni(dataBufferPtr);
+                case AppExecutionAliasReparseTagBufferLayoutVersion.PackageFamilyName:
+                case AppExecutionAliasReparseTagBufferLayoutVersion.MultiAppTypeSupport:
+                    packageFamilyName = Marshal.PtrToStringUni(dataBufferPtr);
 
-                        if (packageFamilyName is not null)
+                    if (packageFamilyName is not null)
+                    {
+                        dataBufferPtr += Encoding.Unicode.GetByteCount(packageFamilyName) + Encoding.Unicode.GetByteCount("\0");
+                        aumid = Marshal.PtrToStringUni(dataBufferPtr);
+
+                        if (aumid is not null)
                         {
-                            dataBufferPtr += Encoding.Unicode.GetByteCount(packageFamilyName) + Encoding.Unicode.GetByteCount("\0");
-                            aumid = Marshal.PtrToStringUni(dataBufferPtr);
+                            dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
 
-                            if (aumid is not null)
-                            {
-                                dataBufferPtr += Encoding.Unicode.GetByteCount(aumid) + Encoding.Unicode.GetByteCount("\0");
-
-                                exePath = Marshal.PtrToStringUni(dataBufferPtr);
-                            }
+                            exePath = Marshal.PtrToStringUni(dataBufferPtr);
                         }
+                    }
 
-                        break;
-                }
-
-                return new AppExecutionAliasMetadata
-                {
-                    PackageFullName = packageFullName ?? string.Empty,
-                    PackageFamilyName = packageFamilyName ?? string.Empty,
-                    Aumid = aumid ?? string.Empty,
-                    ExePath = exePath ?? string.Empty,
-                };
+                    break;
             }
+
+            return new AppExecutionAliasMetadata
+            {
+                PackageFullName = packageFullName ?? string.Empty,
+                PackageFamilyName = packageFamilyName ?? string.Empty,
+                Aumid = aumid ?? string.Empty,
+                ExePath = exePath ?? string.Empty,
+            };
         }
 
         private static void VerifyVersion(AppExecutionAliasReparseTagBufferLayoutVersion version)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs

@@ -3,19 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Xml.Linq;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Win32;
 using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
 using Windows.Win32.System.Com;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 
 namespace Microsoft.CmdPal.Ext.Apps.Programs;
 
@@ -57,7 +55,7 @@ public partial class UWP
         FamilyName = package.FamilyName;
     }
 
-    public unsafe void InitializeAppInfo(string installedLocation)
+    public void InitializeAppInfo(string installedLocation)
     {
         Location = installedLocation;
         LocationLocalized = ShellLocalization.Instance.GetLocalizedPath(installedLocation);
@@ -67,31 +65,26 @@ public partial class UWP
         InitPackageVersion(namespaces);
 
         const uint noAttribute = 0x80;
-        const uint STGMREAD = 0x00000000;
-        try
-        {
-            IStream* stream = null;
-            PInvoke.SHCreateStreamOnFileEx(path, STGMREAD, noAttribute, false, null, &stream).ThrowOnFailure();
-            using var streamHandle = new SafeComHandle((IntPtr)stream);
 
-            Apps = AppxPackageHelper.GetAppsFromManifest(stream).Select(appInManifest =>
-            {
-                using var appHandle = new SafeComHandle(appInManifest);
-                return new UWPApplication((IAppxManifestApplication*)appInManifest, this);
-            }).Where(a =>
+        var access = (uint)STGM.READ;
+        var hResult = PInvoke.SHCreateStreamOnFileEx(path, access, noAttribute, false, null, out IStream stream);
+
+        // S_OK
+        if (hResult == 0)
+        {
+            Apps = AppxPackageHelper.GetAppsFromManifest(stream).Select(appInManifest => new UWPApplication(appInManifest, this)).Where(a =>
             {
                 var valid =
-                    !string.IsNullOrEmpty(a.UserModelId) &&
-                    !string.IsNullOrEmpty(a.DisplayName) &&
-                    a.AppListEntry != "none";
+                !string.IsNullOrEmpty(a.UserModelId) &&
+                !string.IsNullOrEmpty(a.DisplayName) &&
+                a.AppListEntry != "none";
+
                 return valid;
             }).ToList();
         }
-        catch (Exception ex)
+        else
         {
             Apps = Array.Empty<UWPApplication>();
-            Logger.LogError($"Failed to initialize UWP app info for {Name} ({FullName}): {ex.Message}");
-            return;
         }
     }
 
@@ -130,36 +123,35 @@ public partial class UWP
     {
         var windows10 = new Version(10, 0);
         var support = Environment.OSVersion.Version.Major >= windows10.Major;
+        if (support)
+        {
+            var applications = CurrentUserPackages().AsParallel().SelectMany(p =>
+            {
+                UWP u;
+                try
+                {
+                    u = new UWP(p);
+                    u.InitializeAppInfo(p.InstalledLocation);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError(ex.Message);
+                    return Array.Empty<UWPApplication>();
+                }
 
-        if (!support)
+                return u.Apps;
+            });
+
+            var updatedListWithoutDisabledApps = applications
+            .Where(t1 => AllAppsSettings.Instance.DisabledProgramSources.All(x => x.UniqueIdentifier != t1.UniqueIdentifier))
+            .Select(x => x);
+
+            return updatedListWithoutDisabledApps.ToArray();
+        }
+        else
         {
             return Array.Empty<UWPApplication>();
         }
-
-        var appsBag = new ConcurrentBag<UWPApplication>();
-
-        Parallel.ForEach(CurrentUserPackages(), p =>
-        {
-            try
-            {
-                var u = new UWP(p);
-                u.InitializeAppInfo(p.InstalledLocation);
-
-                foreach (var app in u.Apps)
-                {
-                    if (AllAppsSettings.Instance.DisabledProgramSources.All(x => x.UniqueIdentifier != app.UniqueIdentifier))
-                    {
-                        appsBag.Add(app);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex.Message);
-            }
-        });
-
-        return appsBag.ToArray();
     }
 
     private static IEnumerable<IPackage> CurrentUserPackages()

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using System.Xml;
 using ManagedCommon;
@@ -14,9 +13,7 @@ using Microsoft.CmdPal.Ext.Apps.Commands;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.Utils;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.Storage.Packaging.Appx;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 using PackageVersion = Microsoft.CmdPal.Ext.Apps.Programs.UWP.PackageVersion;
 using Theme = Microsoft.CmdPal.Ext.Apps.Utils.Theme;
 
@@ -100,27 +97,27 @@ public class UWPApplication : IProgram
         return commands;
     }
 
-    internal unsafe UWPApplication(IAppxManifestApplication* manifestApp, UWP package)
+    public UWPApplication(IAppxManifestApplication manifestApp, UWP package)
     {
         ArgumentNullException.ThrowIfNull(manifestApp);
 
-        var hr = manifestApp->GetAppUserModelId(out var tmpUserModelIdPtr);
-        UserModelId = ComFreeHelper.GetStringAndFree(hr, tmpUserModelIdPtr);
+        var hr = manifestApp.GetAppUserModelId(out var tmpUserModelId);
+        UserModelId = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpUserModelId);
 
-        manifestApp->GetAppUserModelId(out var tmpUniqueIdentifierPtr);
-        UniqueIdentifier = ComFreeHelper.GetStringAndFree(hr, tmpUniqueIdentifierPtr);
+        hr = manifestApp.GetAppUserModelId(out var tmpUniqueIdentifier);
+        UniqueIdentifier = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpUniqueIdentifier);
 
-        manifestApp->GetStringValue("DisplayName", out var tmpDisplayNamePtr);
-        DisplayName = ComFreeHelper.GetStringAndFree(hr, tmpDisplayNamePtr);
+        hr = manifestApp.GetStringValue("DisplayName", out var tmpDisplayName);
+        DisplayName = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpDisplayName);
 
-        manifestApp->GetStringValue("Description", out var tmpDescriptionPtr);
-        Description = ComFreeHelper.GetStringAndFree(hr, tmpDescriptionPtr);
+        hr = manifestApp.GetStringValue("Description", out var tmpDescription);
+        Description = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpDescription);
 
-        manifestApp->GetStringValue("BackgroundColor", out var tmpBackgroundColorPtr);
-        BackgroundColor = ComFreeHelper.GetStringAndFree(hr, tmpBackgroundColorPtr);
+        hr = manifestApp.GetStringValue("BackgroundColor", out var tmpBackgroundColor);
+        BackgroundColor = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpBackgroundColor);
 
-        manifestApp->GetStringValue("EntryPoint", out var tmpEntryPointPtr);
-        EntryPoint = ComFreeHelper.GetStringAndFree(hr, tmpEntryPointPtr);
+        hr = manifestApp.GetStringValue("EntryPoint", out var tmpEntryPoint);
+        EntryPoint = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, tmpEntryPoint);
 
         Package = package ?? throw new ArgumentNullException(nameof(package));
 
@@ -169,7 +166,7 @@ public class UWPApplication : IProgram
         return false;
     }
 
-    internal unsafe string ResourceFromPri(string packageFullName, string resourceReference)
+    internal string ResourceFromPri(string packageFullName, string resourceReference)
     {
         const string prefix = "ms-resource:";
 
@@ -203,8 +200,30 @@ public class UWPApplication : IProgram
                 parsedFallback = prefix + "///" + key;
             }
 
-            if (string.IsNullOrEmpty(parsedFallback))
+            var outBuffer = new StringBuilder(128);
+            var source = $"@{{{packageFullName}? {parsed}}}";
+            var capacity = (uint)outBuffer.Capacity;
+            var hResult = SHLoadIndirectString(source, outBuffer, capacity, IntPtr.Zero);
+            if (hResult != HRESULT.S_OK)
             {
+                if (!string.IsNullOrEmpty(parsedFallback))
+                {
+                    var sourceFallback = $"@{{{packageFullName}? {parsedFallback}}}";
+                    hResult = SHLoadIndirectString(sourceFallback, outBuffer, capacity, IntPtr.Zero);
+                    if (hResult == HRESULT.S_OK)
+                    {
+                        var loaded = outBuffer.ToString();
+                        if (!string.IsNullOrEmpty(loaded))
+                        {
+                            return loaded;
+                        }
+                        else
+                        {
+                            return string.Empty;
+                        }
+                    }
+                }
+
                 // https://github.com/Wox-launcher/Wox/issues/964
                 // known hresult 2147942522:
                 // 'Microsoft Corporation' violates pattern constraint of '\bms-resource:.{1,256}'.
@@ -213,40 +232,17 @@ public class UWPApplication : IProgram
                 // Microsoft.BingFoodAndDrink_3.0.4.336_x64__8wekyb3d8bbwe: ms-resource:AppDescription
                 return string.Empty;
             }
-
-            var capacity = 1024U;
-            PWSTR outBuffer = new PWSTR((char*)(void*)Marshal.AllocHGlobal((int)capacity * sizeof(char)));
-            var source = $"@{{{packageFullName}? {parsed}}}";
-            void* reserved = null;
-
-            try
+            else
             {
-                PInvoke.SHLoadIndirectString(source, outBuffer, capacity, ref reserved).ThrowOnFailure();
-
                 var loaded = outBuffer.ToString();
-                return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
-            }
-            catch (Exception)
-            {
-                try
+                if (!string.IsNullOrEmpty(loaded))
                 {
-                    var sourceFallback = $"@{{{packageFullName}?{parsedFallback}}}";
-                    PInvoke.SHLoadIndirectString(sourceFallback, outBuffer, capacity, ref reserved).ThrowOnFailure();
-                    var loaded = outBuffer.ToString();
-                    return string.IsNullOrEmpty(loaded) ? string.Empty : loaded;
+                    return loaded;
                 }
-                catch (Exception)
+                else
                 {
-                    // ProgramLogger.Exception($"Unable to load resource {resourceReference} from {packageFullName}", new InvalidOperationException(), GetType(), packageFullName);
                     return string.Empty;
                 }
-                finally
-                {
-                }
-            }
-            finally
-            {
-                Marshal.FreeHGlobal((IntPtr)outBuffer.Value);
             }
         }
         else
@@ -262,12 +258,13 @@ public class UWPApplication : IProgram
             { PackageVersion.Windows8, "SmallLogo" },
         };
 
-    internal unsafe string LogoUriFromManifest(IAppxManifestApplication* app)
+    internal string LogoUriFromManifest(IAppxManifestApplication app)
     {
         if (_logoKeyFromVersion.TryGetValue(Package.Version, out var key))
         {
-            var hr = app->GetStringValue(key, out var logoUriFromAppPtr);
-            return ComFreeHelper.GetStringAndFree(hr, logoUriFromAppPtr);
+            var hr = app.GetStringValue(key, out var logoUriFromApp);
+            _ = AppxPackageHelper.CheckHRAndReturnOrThrow(hr, logoUriFromApp);
+            return logoUriFromApp;
         }
         else
         {
@@ -352,7 +349,7 @@ public class UWPApplication : IProgram
             var prefix = path.Substring(0, end);
             var paths = new List<string> { };
             const int appIconSize = 36;
-            var targetSizes = new List<int> { 16, 24, 30, 36, 44, 60, 72, 96, 128, 180, 256 };
+            var targetSizes = new List<int> { 16, 24, 30, 36, 44, 60, 72, 96, 128, 180, 256 }.AsParallel();
             var pathFactorPairs = new Dictionary<string, int>();
 
             foreach (var factor in targetSizes)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
 using System.Diagnostics;
@@ -842,69 +841,18 @@ public class Win32Program : IProgram
             var disabledProgramsList = settings.DisabledProgramSources;
 
             // Get all paths but exclude all normal .Executables
-            var pathBag = new ConcurrentBag<string>();
+            paths.UnionWith(sources
+                .AsParallel()
+                .SelectMany(source => source.IsEnabled ? source.GetPaths() : Enumerable.Empty<string>())
+                .Where(programPath => disabledProgramsList.All(x => x.UniqueIdentifier != programPath))
+                .Where(path => !ExecutableApplicationExtensions.Contains(Extension(path))));
+            runCommandPaths.UnionWith(runCommandSources
+                .AsParallel()
+                .SelectMany(source => source.IsEnabled ? source.GetPaths() : Enumerable.Empty<string>())
+                .Where(programPath => disabledProgramsList.All(x => x.UniqueIdentifier != programPath)));
 
-            Parallel.ForEach(sources, source =>
-            {
-                if (!source.IsEnabled)
-                {
-                    return;
-                }
-
-                foreach (var path in source.GetPaths())
-                {
-                    if (disabledProgramsList.All(x => x.UniqueIdentifier != path) &&
-                        !ExecutableApplicationExtensions.Contains(Extension(path)))
-                    {
-                        pathBag.Add(path);
-                    }
-                }
-            });
-
-            paths.UnionWith(pathBag);
-
-            var runCommandPathBag = new ConcurrentBag<string>();
-
-            Parallel.ForEach(runCommandSources, source =>
-            {
-                if (!source.IsEnabled)
-                {
-                    return;
-                }
-
-                foreach (var path in source.GetPaths())
-                {
-                    if (disabledProgramsList.All(x => x.UniqueIdentifier != path))
-                    {
-                        runCommandPathBag.Add(path);
-                    }
-                }
-            });
-
-            runCommandPaths.UnionWith(runCommandPathBag);
-
-            var programsList = new ConcurrentBag<Win32Program>();
-            Parallel.ForEach(paths, source =>
-            {
-                var program = GetProgramFromPath(source);
-                if (program != null)
-                {
-                    programsList.Add(program);
-                }
-            });
-
-            var runCommandProgramsList = new ConcurrentBag<Win32Program>();
-            Parallel.ForEach(runCommandPaths, source =>
-            {
-                var program = GetRunCommandProgramFromPath(source);
-                if (program != null)
-                {
-                    runCommandProgramsList.Add(program);
-                }
-            });
-
-            var programs = programsList.ToList();
-            var runCommandPrograms = runCommandProgramsList.ToList();
+            var programs = paths.AsParallel().Select(source => GetProgramFromPath(source));
+            var runCommandPrograms = runCommandPaths.AsParallel().Select(source => GetRunCommandProgramFromPath(source));
 
             return DeduplicatePrograms(programs.Concat(runCommandPrograms).Where(program => program?.Valid == true));
         }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs

@@ -69,6 +69,11 @@ public class ListRepository<T> : IRepository<T>, IEnumerable<T>
         }
     }
 
+    public ParallelQuery<T> AsParallel()
+    {
+        return _items.Values.AsParallel();
+    }
+
     public bool Contains(T item)
     {
         if (item is not null)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramRepository.cs

@@ -6,8 +6,8 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.IO.Abstractions;
 using System.Threading.Tasks;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Programs;
@@ -15,9 +15,11 @@ using Win32Program = Microsoft.CmdPal.Ext.Apps.Programs.Win32Program;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
 
-[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)]
 internal sealed partial class Win32ProgramRepository : ListRepository<Programs.Win32Program>, IProgramRepository
 {
+    private static readonly IFileSystem FileSystem = new FileSystem();
+    private static readonly IPath Path = FileSystem.Path;
+
     private const string LnkExtension = ".lnk";
     private const string UrlExtension = ".url";
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ComFreeHelper.cs

@@ -1,35 +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 Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.System.Com;
-
-namespace Microsoft.CmdPal.Ext.Apps.Utils;
-
-public static class ComFreeHelper
-{
-    internal static unsafe string GetStringAndFree(HRESULT hr, PWSTR ptr)
-    {
-        hr.ThrowOnFailure();
-        try
-        {
-            return ptr.ToString();
-        }
-        finally
-        {
-            PInvoke.CoTaskMemFree(ptr);
-        }
-    }
-
-    public static unsafe void ComObjectRelease<T>(T* comPtr)
-        where T : unmanaged
-    {
-        if (comPtr != null)
-        {
-            ((IUnknown*)comPtr)->Release();
-        }
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Native.cs

@@ -0,0 +1,157 @@
+// 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.CodeAnalysis;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Microsoft.CmdPal.Ext.Apps.Utils;
+
+[SuppressMessage("Interoperability", "CA1401:P/Invokes should not be visible", Justification = "We want plugins to share this NativeMethods class, instead of each one creating its own.")]
+public sealed class Native
+{
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern int SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, int cchOutBuf, nint ppvReserved);
+
+    [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+    public static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string path, nint pbc, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
+
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern HRESULT SHCreateStreamOnFileEx(string fileName, STGM grfMode, uint attributes, bool create, System.Runtime.InteropServices.ComTypes.IStream reserved, out System.Runtime.InteropServices.ComTypes.IStream stream);
+
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    public static extern HRESULT SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, uint cchOutBuf, nint ppvReserved);
+
+    public enum HRESULT : uint
+    {
+        /// <summary>
+        /// Operation successful.
+        /// </summary>
+        S_OK = 0x00000000,
+
+        /// <summary>
+        /// Operation successful. (negative condition/no operation)
+        /// </summary>
+        S_FALSE = 0x00000001,
+
+        /// <summary>
+        /// Not implemented.
+        /// </summary>
+        E_NOTIMPL = 0x80004001,
+
+        /// <summary>
+        /// No such interface supported.
+        /// </summary>
+        E_NOINTERFACE = 0x80004002,
+
+        /// <summary>
+        /// Pointer that is not valid.
+        /// </summary>
+        E_POINTER = 0x80004003,
+
+        /// <summary>
+        /// Operation aborted.
+        /// </summary>
+        E_ABORT = 0x80004004,
+
+        /// <summary>
+        /// Unspecified failure.
+        /// </summary>
+        E_FAIL = 0x80004005,
+
+        /// <summary>
+        /// Unexpected failure.
+        /// </summary>
+        E_UNEXPECTED = 0x8000FFFF,
+
+        /// <summary>
+        /// General access denied error.
+        /// </summary>
+        E_ACCESSDENIED = 0x80070005,
+
+        /// <summary>
+        /// Handle that is not valid.
+        /// </summary>
+        E_HANDLE = 0x80070006,
+
+        /// <summary>
+        /// Failed to allocate necessary memory.
+        /// </summary>
+        E_OUTOFMEMORY = 0x8007000E,
+
+        /// <summary>
+        /// One or more arguments are not valid.
+        /// </summary>
+        E_INVALIDARG = 0x80070057,
+
+        /// <summary>
+        /// The operation was canceled by the user. (Error source 7 means Win32.)
+        /// </summary>
+        /// <SeeAlso href="https://learn.microsoft.com/windows/win32/debug/system-error-codes--1000-1299-"/>
+        /// <SeeAlso href="https://en.wikipedia.org/wiki/HRESULT"/>
+        E_CANCELLED = 0x800704C7,
+    }
+
+    public static class ShellItemTypeConstants
+    {
+        /// <summary>
+        /// Guid for type IShellItem.
+        /// </summary>
+        public static readonly Guid ShellItemGuid = new("43826d1e-e718-42ee-bc55-a1e261c37bfe");
+
+        /// <summary>
+        /// Guid for type IShellItem2.
+        /// </summary>
+        public static readonly Guid ShellItem2Guid = new("7E9FB0D3-919F-4307-AB2E-9B1860310C93");
+    }
+
+    /// <summary>
+    /// The following are ShellItem DisplayName types.
+    /// </summary>
+    [Flags]
+    public enum SIGDN : uint
+    {
+        NORMALDISPLAY = 0,
+        PARENTRELATIVEPARSING = 0x80018001,
+        PARENTRELATIVEFORADDRESSBAR = 0x8001c001,
+        DESKTOPABSOLUTEPARSING = 0x80028000,
+        PARENTRELATIVEEDITING = 0x80031001,
+        DESKTOPABSOLUTEEDITING = 0x8004c000,
+        FILESYSPATH = 0x80058000,
+        URL = 0x80068000,
+    }
+
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
+    public interface IShellItem
+    {
+        void BindToHandler(
+            nint pbc,
+            [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
+            [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
+            out nint ppv);
+
+        void GetParent(out IShellItem ppsi);
+
+        void GetDisplayName(SIGDN sigdnName, [MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
+
+        void GetAttributes(uint sfgaoMask, out uint psfgaoAttribs);
+
+        void Compare(IShellItem psi, uint hint, out int piOrder);
+    }
+
+    /// <summary>
+    /// <see href="https://learn.microsoft.com/windows/win32/stg/stgm-constants">see all STGM values</see>
+    /// </summary>
+    [Flags]
+    public enum STGM : long
+    {
+        READ = 0x00000000L,
+        WRITE = 0x00000001L,
+        READWRITE = 0x00000002L,
+        CREATE = 0x00001000L,
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/SafeComHandle.cs

@@ -1,30 +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.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Ext.Apps.Utils;
-
-public partial class SafeComHandle : SafeHandle
-{
-    public SafeComHandle()
-        : base(IntPtr.Zero, ownsHandle: true)
-    {
-    }
-
-    public SafeComHandle(IntPtr handle)
-        : base(IntPtr.Zero, ownsHandle: true)
-    {
-        SetHandle(handle);
-    }
-
-    public override bool IsInvalid => handle == IntPtr.Zero;
-
-    protected override bool ReleaseHandle()
-    {
-        var count = Marshal.Release(handle);
-        return true;
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLinkHelper.cs

@@ -3,17 +3,124 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
 using System.Text;
 using ManagedCommon;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-using Windows.Win32.System.Com;
-using Windows.Win32.UI.Shell;
 
 namespace Microsoft.CmdPal.Ext.Apps.Utils;
 
 public class ShellLinkHelper : IShellLinkHelper
 {
+    [Flags]
+    private enum SLGP_FLAGS
+    {
+        SLGP_SHORTPATH = 0x1,
+        SLGP_UNCPRIORITY = 0x2,
+        SLGP_RAWPATH = 0x4,
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching COM")]
+    private struct WIN32_FIND_DATAW
+    {
+        public uint dwFileAttributes;
+        public long ftCreationTime;
+        public long ftLastAccessTime;
+        public long ftLastWriteTime;
+        public uint nFileSizeHigh;
+        public uint nFileSizeLow;
+        public uint dwReserved0;
+        public uint dwReserved1;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+        public string cFileName;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
+        public string cAlternateFileName;
+    }
+
+    [Flags]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1707:Identifiers should not contain underscores", Justification = "Implements COM Interface")]
+    public enum SLR_FLAGS
+    {
+        SLR_NO_UI = 0x1,
+        SLR_ANY_MATCH = 0x2,
+        SLR_UPDATE = 0x4,
+        SLR_NOUPDATE = 0x8,
+        SLR_NOSEARCH = 0x10,
+        SLR_NOTRACK = 0x20,
+        SLR_NOLINKINFO = 0x40,
+        SLR_INVOKE_MSI = 0x80,
+    }
+
+    // Reference : http://www.pinvoke.net/default.aspx/Interfaces.IShellLinkW
+
+    // The IShellLink interface allows Shell links to be created, modified, and resolved
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("000214F9-0000-0000-C000-000000000046")]
+    private interface IShellLinkW
+    {
+        /// <summary>Retrieves the path and file name of a Shell link object</summary>
+        void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, ref WIN32_FIND_DATAW pfd, SLGP_FLAGS fFlags);
+
+        /// <summary>Retrieves the list of item identifiers for a Shell link object</summary>
+        void GetIDList(out nint ppidl);
+
+        /// <summary>Sets the pointer to an item identifier list (PIDL) for a Shell link object.</summary>
+        void SetIDList(nint pidl);
+
+        /// <summary>Retrieves the description string for a Shell link object</summary>
+        void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName);
+
+        /// <summary>Sets the description for a Shell link object. The description can be any application-defined string</summary>
+        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+
+        /// <summary>Retrieves the name of the working directory for a Shell link object</summary>
+        void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+
+        /// <summary>Sets the name of the working directory for a Shell link object</summary>
+        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+
+        /// <summary>Retrieves the command-line arguments associated with a Shell link object</summary>
+        void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+
+        /// <summary>Sets the command-line arguments for a Shell link object</summary>
+        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+
+        /// <summary>Retrieves the hot key for a Shell link object</summary>
+        void GetHotkey(out short pwHotkey);
+
+        /// <summary>Sets a hot key for a Shell link object</summary>
+        void SetHotkey(short wHotkey);
+
+        /// <summary>Retrieves the show command for a Shell link object</summary>
+        void GetShowCmd(out int piShowCmd);
+
+        /// <summary>Sets the show command for a Shell link object. The show command sets the initial show state of the window.</summary>
+        void SetShowCmd(int iShowCmd);
+
+        /// <summary>Retrieves the location (path and index) of the icon for a Shell link object</summary>
+        void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
+
+        /// <summary>Sets the location (path and index) of the icon for a Shell link object</summary>
+        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+
+        /// <summary>Sets the relative path to the Shell link object</summary>
+        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
+
+        /// <summary>Attempts to find the target of a Shell link, even if it has been moved or renamed</summary>
+        void Resolve(ref nint hwnd, SLR_FLAGS fFlags);
+
+        /// <summary>Sets the path and file name of a Shell link object</summary>
+        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+    }
+
+    [ComImport]
+    [Guid("00021401-0000-0000-C000-000000000046")]
+    private class ShellLink
+    {
+    }
+
     // Contains the description of the app
     public string Description { get; set; } = string.Empty;
 
@@ -23,63 +130,60 @@ public class ShellLinkHelper : IShellLinkHelper
     public bool HasArguments { get; set; }
 
     // Retrieve the target path using Shell Link
-    public unsafe string RetrieveTargetPath(string path)
+    public string RetrieveTargetPath(string path)
     {
-        var target = string.Empty;
-        const int MAX_PATH = 260;
-        IShellLinkW* link = null;
+        var link = new ShellLink();
+        const int STGM_READ = 0;
 
-        PInvoke.CoCreateInstance(typeof(ShellLink).GUID, null, CLSCTX.CLSCTX_INPROC_SERVER, out link).ThrowOnFailure();
-        using var linkHandle = new SafeComHandle((IntPtr)link);
-
-        const int STGMREAD = 0;
-
-        IPersistFile* persistFile = null;
-        Guid iid = typeof(IPersistFile).GUID;
-        ((IUnknown*)link)->QueryInterface(&iid, (void**)&persistFile);
-        if (persistFile != null)
+        try
         {
-            using var persistFileHandle = new SafeComHandle((IntPtr)persistFile);
-            try
-            {
-                persistFile->Load(path, STGMREAD);
-            }
-            catch (System.IO.FileNotFoundException)
-            {
-                // Log.Exception($"Failed to load {path}, {e.Message}", e, GetType());
-                return string.Empty;
-            }
+            ((IPersistFile)link).Load(path, STGM_READ);
+        }
+        catch (System.IO.FileNotFoundException ex)
+        {
+            Logger.LogError(ex.Message);
+            return string.Empty;
         }
 
-        var hwnd = HWND.Null;
-        const uint SLR_NO_UI = 0x1;
-        link->Resolve(hwnd, SLR_NO_UI);
+        var hwnd = default(nint);
+        ((IShellLinkW)link).Resolve(ref hwnd, 0);
 
-        var buffer = stackalloc char[MAX_PATH];
+        const int MAX_PATH = 260;
+        var buffer = new StringBuilder(MAX_PATH);
 
-        var hr = link->GetPath((PWSTR)buffer, MAX_PATH, null, 0x1);
-
-        target = hr.Succeeded ? new string(buffer) : string.Empty;
+        var data = default(WIN32_FIND_DATAW);
+        ((IShellLinkW)link).GetPath(buffer, buffer.Capacity, ref data, SLGP_FLAGS.SLGP_SHORTPATH);
+        var target = buffer.ToString();
 
         // To set the app description
         if (!string.IsNullOrEmpty(target))
         {
-            var descBuffer = stackalloc char[MAX_PATH];
-            var desHr = link->GetDescription(descBuffer, MAX_PATH);
-            Description = desHr.Succeeded ? new string(descBuffer) : string.Empty;
+            buffer = new StringBuilder(MAX_PATH);
+            try
+            {
+                ((IShellLinkW)link).GetDescription(buffer, MAX_PATH);
+                Description = buffer.ToString();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex.Message);
+                Description = string.Empty;
+            }
 
-            var argsBuffer = stackalloc char[MAX_PATH];
-            var argHr = link->GetArguments(argsBuffer, MAX_PATH);
-
-            Arguments = argHr.Succeeded ? new string(argsBuffer) : string.Empty;
+            var argumentBuffer = new StringBuilder(MAX_PATH);
+            ((IShellLinkW)link).GetArguments(argumentBuffer, argumentBuffer.Capacity);
+            Arguments = argumentBuffer.ToString();
 
             // Set variable to true if the program takes in any arguments
-            if (Arguments.Length != 0)
+            if (argumentBuffer.Length != 0)
             {
                 HasArguments = true;
             }
         }
 
+        // To release unmanaged memory
+        Marshal.ReleaseComObject(link);
+
         return target;
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellLocalization.cs

@@ -4,8 +4,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.IO;
-using Windows.Win32;
-using Windows.Win32.UI.Shell;
+using static Microsoft.CmdPal.Ext.Apps.Utils.Native;
 
 namespace Microsoft.CmdPal.Ext.Apps.Utils;
 
@@ -24,7 +23,7 @@ public class ShellLocalization
     /// </summary>
     /// <param name="path">Path to the shell item (e. g. shortcut 'File Explorer.lnk').</param>
     /// <returns>The localized name as string or <see cref="string.Empty"/>.</returns>
-    public unsafe string GetLocalizedName(string path)
+    public string GetLocalizedName(string path)
     {
         var lowerInvariantPath = path.ToLowerInvariant();
 
@@ -34,29 +33,18 @@ public class ShellLocalization
             return value;
         }
 
-        void* shellItemPtrVoid = null;
-        try
-        {
-            var retCode = PInvoke.SHCreateItemFromParsingName(path, null, typeof(IShellItem).GUID, out shellItemPtrVoid).ThrowOnFailure();
-            using var shellItemHandle = new SafeComHandle((IntPtr)shellItemPtrVoid);
-            IShellItem* shellItemPtr = (IShellItem*)shellItemPtrVoid;
-
-            var hr = shellItemPtr->GetDisplayName(SIGDN.SIGDN_NORMALDISPLAY, out var filenamePtr);
-
-            var filename = ComFreeHelper.GetStringAndFree(hr, filenamePtr);
-
-            if (filename == null)
-            {
-                return string.Empty;
-            }
-
-            _ = _localizationCache.TryAdd(lowerInvariantPath, filename);
-            return filename;
-        }
-        catch (Exception)
+        var shellItemType = ShellItemTypeConstants.ShellItemGuid;
+        var retCode = SHCreateItemFromParsingName(path, nint.Zero, ref shellItemType, out var shellItem);
+        if (retCode != 0)
         {
             return string.Empty;
         }
+
+        shellItem.GetDisplayName(SIGDN.NORMALDISPLAY, out var filename);
+
+        _ = _localizationCache.TryAdd(lowerInvariantPath, filename);
+
+        return filename;
     }
 
     /// <summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/ClipboardHelper.cs

@@ -30,8 +30,6 @@ internal static class ClipboardHelper
         (StandardDataFormats.Bitmap, ClipboardFormat.Image),
     ];
 
-    private static readonly ClipboardThreadQueue ClipboardThreadQueue = new ClipboardThreadQueue();
-
     internal static async Task<ClipboardFormat> GetAvailableClipboardFormatsAsync(DataPackageView clipboardData)
     {
         var availableClipboardFormats = DataFormats.Aggregate(
@@ -60,12 +58,9 @@ internal static class ClipboardHelper
             try
             {
                 // Clipboard.SetContentWithOptions(output, null);
-                ClipboardThreadQueue.EnqueueTask(() =>
-                {
-                    Clipboard.SetContent(output);
-                    Flush();
-                    ExtensionHost.LogMessage(new LogMessage() { Message = "Copied text to clipboard" });
-                });
+                Clipboard.SetContent(output);
+                Flush();
+                ExtensionHost.LogMessage(new LogMessage() { Message = "Copied text to clipboard" });
             }
             catch (COMException ex)
             {
@@ -79,32 +74,27 @@ internal static class ClipboardHelper
         // TODO(stefan): For some reason Flush() fails from time to time when directly activated via hotkey.
         // Calling inside a loop makes it work.
         // Exception is: The operation is not permitted because the calling application is not the owner of the data on the clipboard.
-        ClipboardThreadQueue.EnqueueTask(() =>
+        const int maxAttempts = 5;
+        for (var i = 1; i <= maxAttempts; i++)
         {
-            const int maxAttempts = 5;
-
-            for (var i = 1; i <= maxAttempts; i++)
+            try
             {
-                try
+                Task.Run(Clipboard.Flush).Wait();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                if (i == maxAttempts)
                 {
-                    Task.Run(Clipboard.Flush).Wait();
-                    return;
-                }
-                catch (Exception ex)
-                {
-                    if (i == maxAttempts)
+                    ExtensionHost.LogMessage(new LogMessage()
                     {
-                        ExtensionHost.LogMessage(new LogMessage()
-                        {
-                            Message = $"{nameof(Clipboard)}.{nameof(Flush)}() failed: {ex}",
-                        });
-                    }
+                        Message = $"{nameof(Clipboard)}.{nameof(Flush)}() failed: {ex}",
+                    });
                 }
             }
-        });
+        }
 
-        // We cannot get the real result of the Flush() call here, as it is executed in a different thread.
-        return true;
+        return false;
     }
 
     private static async Task<bool> FlushAsync() => await Task.Run(Flush);
@@ -115,7 +105,7 @@ internal static class ClipboardHelper
 
         DataPackage output = new();
         output.SetStorageItems([storageFile]);
-        ClipboardThreadQueue.EnqueueTask(() => Clipboard.SetContent(output));
+        Clipboard.SetContent(output);
 
         await FlushAsync();
     }
@@ -128,7 +118,7 @@ internal static class ClipboardHelper
         {
             DataPackage output = new();
             output.SetBitmap(image);
-            ClipboardThreadQueue.EnqueueTask(() => Clipboard.SetContentWithOptions(output, null));
+            Clipboard.SetContentWithOptions(output, null);
 
             Flush();
         }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/ClipboardThreadScheduler.cs

@@ -1,74 +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.Threading;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
-
-public partial class ClipboardThreadQueue : IDisposable
-{
-    private readonly Thread _thread;
-    private readonly ConcurrentQueue<Action> _taskQueue = new ConcurrentQueue<Action>();
-    private readonly AutoResetEvent _taskAvailable = new AutoResetEvent(false);
-    private readonly CancellationTokenSource cancellationToken = new CancellationTokenSource();
-
-    public ClipboardThreadQueue()
-    {
-        _thread = new Thread(() =>
-        {
-            var hr = NativeMethods.CoInitialize(IntPtr.Zero);
-            if (hr != 0)
-            {
-                ExtensionHost.LogMessage($"CoInitialize failed with HRESULT: {hr}");
-            }
-
-            while (true)
-            {
-                _taskAvailable.WaitOne();
-
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    break;
-                }
-
-                while (_taskQueue.TryDequeue(out var task))
-                {
-                    try
-                    {
-                        task();
-                    }
-                    catch (Exception ex)
-                    {
-                        ExtensionHost.LogMessage($"Error executing task in ClipboardThreadQueue: {ex.Message}");
-                    }
-                }
-            }
-
-            NativeMethods.CoUninitialize();
-        });
-
-        _thread.SetApartmentState(ApartmentState.STA);
-        _thread.IsBackground = true;
-        _thread.Start();
-    }
-
-    public void EnqueueTask(Action task)
-    {
-        _taskQueue.Enqueue(task);
-        _taskAvailable.Set();
-    }
-
-    public void Dispose()
-    {
-        cancellationToken.Cancel();
-        _taskAvailable.Set();
-        _thread.Join(); // Wait for the thread to finish processing tasks
-
-        _taskAvailable.Dispose();
-        GC.SuppressFinalize(this);
-    }
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/NativeMethods.cs

@@ -8,7 +8,7 @@ using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 
-public static partial class NativeMethods
+internal static class NativeMethods
 {
     [StructLayout(LayoutKind.Sequential)]
     [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Matching Native Structure")]
@@ -98,10 +98,4 @@ public static partial class NativeMethods
 
     [DllImport("user32.dll")]
     internal static extern bool GetCursorPos(out PointInter lpPoint);
-
-    [LibraryImport("ole32.dll")]
-    internal static partial int CoInitialize(IntPtr pvReserved);
-
-    [LibraryImport("ole32.dll")]
-    internal static partial void CoUninitialize();
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenPropertiesCommand.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Indexer.Data;
@@ -14,7 +13,6 @@ using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
-using static Microsoft.CmdPal.Ext.Indexer.Native.NativeMethods;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Commands;
 
@@ -29,16 +27,19 @@ internal sealed partial class OpenPropertiesCommand : InvokableCommand
 
         try
         {
+            var filenamePCWSTR = new PCWSTR((char*)filenamePtr);
+            var propertiesPCWSTR = new PCWSTR((char*)propertiesPtr);
+
             var info = new SHELLEXECUTEINFOW
             {
-                cbSize = (uint)sizeof(SHELLEXECUTEINFOW),
-                lpVerb = propertiesPtr,
-                lpFile = filenamePtr,
+                cbSize = (uint)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
+                lpVerb = propertiesPCWSTR,
+                lpFile = filenamePCWSTR,
                 nShow = (int)SHOW_WINDOW_CMD.SW_SHOW,
                 fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
             };
 
-            return ShellExecuteEx(ref info);
+            return PInvoke.ShellExecuteEx(ref info);
         }
         finally
         {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/OpenWithCommand.cs

@@ -2,8 +2,6 @@
 // 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.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Native;
@@ -13,7 +11,6 @@ using Windows.Win32;
 using Windows.Win32.Foundation;
 using Windows.Win32.UI.Shell;
 using Windows.Win32.UI.WindowsAndMessaging;
-using static Microsoft.CmdPal.Ext.Indexer.Native.NativeMethods;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Commands;
 
@@ -28,16 +25,19 @@ internal sealed partial class OpenWithCommand : InvokableCommand
 
         try
         {
+            var filenamePCWSTR = new PCWSTR((char*)filenamePtr);
+            var verbPCWSTR = new PCWSTR((char*)verbPtr);
+
             var info = new SHELLEXECUTEINFOW
             {
-                cbSize = (uint)sizeof(SHELLEXECUTEINFOW),
-                lpVerb = verbPtr,
-                lpFile = filenamePtr,
+                cbSize = (uint)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
+                lpVerb = verbPCWSTR,
+                lpFile = filenamePCWSTR,
                 nShow = (int)SHOW_WINDOW_CMD.SW_SHOWNORMAL,
                 fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
             };
 
-            return ShellExecuteEx(ref info);
+            return PInvoke.ShellExecuteEx(ref info);
         }
         finally
         {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/DataSourceManager.cs

@@ -3,17 +3,17 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 using ManagedCommon;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-using Microsoft.CmdPal.Ext.Indexer.Native;
+using Windows.Win32;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Search;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
 
 internal static class DataSourceManager
 {
+    private static readonly Guid CLSIDCollatorDataSource = new("9E175B8B-F52A-11D8-B9A5-505054503030");
+
     private static IDBInitialize _dataSource;
 
     public static IDBInitialize GetDataSource()
@@ -28,36 +28,22 @@ internal static class DataSourceManager
 
     private static bool InitializeDataSource()
     {
-        var riid = typeof(IDBInitialize).GUID;
-        var hr = NativeMethods.CoCreateInstance(ref Unsafe.AsRef(in NativeHelpers.CsWin32GUID.CLSIDCollatorDataSource), IntPtr.Zero, NativeHelpers.CLSCTXINPROCALL, ref riid, out var dataSourceObjPtr);
+        var hr = PInvoke.CoCreateInstance(CLSIDCollatorDataSource, null, CLSCTX.CLSCTX_INPROC_SERVER, typeof(IDBInitialize).GUID, out var dataSourceObj);
         if (hr != 0)
         {
             Logger.LogError("CoCreateInstance failed: " + hr);
             return false;
         }
 
-        if (dataSourceObjPtr == IntPtr.Zero)
-        {
-            Logger.LogError("CoCreateInstance failed: dataSourceObjPtr is null");
-            return false;
-        }
-
-        var comWrappers = new StrategyBasedComWrappers();
-        _dataSource = (IDBInitialize)comWrappers.GetOrCreateObjectForComInstance(dataSourceObjPtr, CreateObjectFlags.None);
-
-        if (_dataSource == null)
+        if (dataSourceObj == null)
         {
             Logger.LogError("CoCreateInstance failed: dataSourceObj is null");
             return false;
         }
 
+        _dataSource = (IDBInitialize)dataSourceObj;
         _dataSource.Initialize();
 
-        if (dataSourceObjPtr != IntPtr.Zero)
-        {
-            Marshal.Release(dataSourceObjPtr);
-        }
-
         return true;
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/DBPROP.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Runtime.InteropServices;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-using Microsoft.CmdPal.Ext.Indexer.Native;
 using Windows.Win32.Storage.IndexServer;
 using Windows.Win32.System.Com.StructuredStorage;
 
@@ -18,6 +16,6 @@ internal struct DBPROP
     public uint dwOptions;
     public uint dwStatus;
     public DBID colid;
-    public PropVariant vValue;
+    public PROPVARIANT vValue;
 #pragma warning restore SA1307 // Accessible fields should begin with upper-case letter
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowset.cs

@@ -4,38 +4,40 @@
 
 using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
 
+[ComImport]
 [Guid("0c733a7c-2a1c-11ce-ade5-00aa0044773d")]
-[GeneratedComInterface]
-public partial interface IRowset
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IRowset
 {
-    void AddRefRows(
+    [PreserveSig]
+    int AddRefRows(
         uint cRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
 
-    void GetData(
+    [PreserveSig]
+    int GetData(
         IntPtr hRow,
         IntPtr hAccessor,
         IntPtr pData);
 
-    void GetNextRows(
+    [PreserveSig]
+    int GetNextRows(
        IntPtr hReserved,
        long lRowsOffset,
        long cRows,
        out uint pcRowsObtained,
        out IntPtr prghRows);
 
-    void ReleaseRows(
+    [PreserveSig]
+    int ReleaseRows(
         uint cRows,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
         IntPtr rgRowOptions,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
-
-    void RestartPosition(nuint hReserved);
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/OleDB/IRowsetInfo.cs

@@ -4,29 +4,29 @@
 
 using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
 
+[ComImport]
 [Guid("0C733A55-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface]
-public partial interface IRowsetInfo
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IRowsetInfo
 {
     [PreserveSig]
     int GetProperties(
         uint cPropertyIDSets,
-        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
+        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
         out ulong pcPropertySets,
         out IntPtr prgPropertySets);
 
     [PreserveSig]
     int GetReferencedRowset(
         uint iOrdinal,
-        ref Guid riid,
-        [MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);
 
     [PreserveSig]
     int GetSpecification(
-        ref Guid riid,
-        [MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
+        [In] ref Guid riid,
+        [Out, MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchQuery.cs

@@ -8,10 +8,12 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;
 using Microsoft.CmdPal.Ext.Indexer.Native;
-using static Microsoft.CmdPal.Ext.Indexer.Native.NativeHelpers;
+using Windows.Win32;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Search;
+using Windows.Win32.UI.Shell.PropertiesSystem;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
 
@@ -118,6 +120,11 @@ internal sealed partial class SearchQuery : IDisposable
                 // We need to generate a search query string with the search text the user entered above
                 if (currentRowset != null)
                 {
+                    if (reuseRowset != null)
+                    {
+                        Marshal.ReleaseComObject(reuseRowset);
+                    }
+
                     // We have a previous rowset, this means the user is typing and we should store this
                     // recapture the where ID from this so the next ExecuteSync call will be faster
                     reuseRowset = currentRowset;
@@ -141,12 +148,13 @@ internal sealed partial class SearchQuery : IDisposable
 
     private bool HandleRow(IGetRow getRow, nuint rowHandle)
     {
+        object propertyStorePtr = null;
+
         try
         {
-            var riid = CsWin32GUID.PropertyStore;
-
-            getRow.GetRowFromHROW(null, rowHandle, ref riid, out var propertyStore);
+            getRow.GetRowFromHROW(null, rowHandle, typeof(IPropertyStore).GUID, out propertyStorePtr);
 
+            var propertyStore = (IPropertyStore)propertyStorePtr;
             if (propertyStore == null)
             {
                 Logger.LogError("Failed to get IPropertyStore interface");
@@ -168,6 +176,14 @@ internal sealed partial class SearchQuery : IDisposable
             Logger.LogError("Error handling row", ex);
             return false;
         }
+        finally
+        {
+            // Ensure the COM object is released if not returned
+            if (propertyStorePtr != null)
+            {
+                Marshal.ReleaseComObject(propertyStorePtr);
+            }
+        }
     }
 
     public bool FetchRows(int offset, int limit)
@@ -178,17 +194,16 @@ internal sealed partial class SearchQuery : IDisposable
             return false;
         }
 
-        IGetRow getRow = null;
-
-        try
-        {
-            getRow = (IGetRow)currentRowset;
-        }
-        catch (Exception)
+        if (currentRowset is not IGetRow)
         {
             Logger.LogInfo("Reset the current rowset");
             ExecuteSyncInternal();
-            getRow = (IGetRow)currentRowset;
+        }
+
+        if (currentRowset is not IGetRow getRow)
+        {
+            Logger.LogError("Rowset does not support IGetRow interface");
+            return false;
         }
 
         uint rowCountReturned;
@@ -196,7 +211,12 @@ internal sealed partial class SearchQuery : IDisposable
 
         try
         {
-            currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
+            var res = currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
+            if (res < 0)
+            {
+                Logger.LogError($"Error fetching rows: {res}");
+                return false;
+            }
 
             if (rowCountReturned == 0)
             {
@@ -217,7 +237,11 @@ internal sealed partial class SearchQuery : IDisposable
                 }
             }
 
-            currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
+            res = currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
+            if (res != 0)
+            {
+                Logger.LogError($"Error releasing rows: {res}");
+            }
 
             Marshal.FreeCoTaskMem(prghRows);
             prghRows = IntPtr.Zero;
@@ -244,6 +268,11 @@ internal sealed partial class SearchQuery : IDisposable
         var rowset = ExecuteCommand(queryStr);
         if (rowset != null)
         {
+            if (reuseRowset != null)
+            {
+                Marshal.ReleaseComObject(reuseRowset);
+            }
+
             reuseRowset = rowset;
             reuseWhereID = GetReuseWhereId(reuseRowset);
         }
@@ -251,50 +280,110 @@ internal sealed partial class SearchQuery : IDisposable
 
     private unsafe IRowset ExecuteCommand(string queryStr)
     {
-        if (string.IsNullOrEmpty(queryStr))
-        {
-            return null;
-        }
+        object sessionPtr = null;
+        object commandPtr = null;
 
         try
         {
             var session = (IDBCreateSession)DataSourceManager.GetDataSource();
-            var guid = typeof(IDBCreateCommand).GUID;
-            session.CreateSession(IntPtr.Zero, ref guid, out var ppDBSession);
-
-            if (ppDBSession == null)
+            session.CreateSession(null, typeof(IDBCreateCommand).GUID, out sessionPtr);
+            if (sessionPtr == null)
             {
                 Logger.LogError("CreateSession failed");
                 return null;
             }
 
-            var createCommand = (IDBCreateCommand)ppDBSession;
-            guid = typeof(ICommandText).GUID;
-            createCommand.CreateCommand(IntPtr.Zero, ref guid, out ICommandText commandText);
+            var createCommand = (IDBCreateCommand)sessionPtr;
+            createCommand.CreateCommand(null, typeof(ICommandText).GUID, out commandPtr);
+            if (commandPtr == null)
+            {
+                Logger.LogError("CreateCommand failed");
+                return null;
+            }
 
+            var commandText = (ICommandText)commandPtr;
             if (commandText == null)
             {
                 Logger.LogError("Failed to get ICommandText interface");
                 return null;
             }
 
-            var riid = NativeHelpers.OleDb.DbGuidDefault;
+            commandText.SetCommandText(in NativeHelpers.OleDb.DbGuidDefault, queryStr);
+            commandText.Execute(null, typeof(IRowset).GUID, null, null, out var rowsetPointer);
 
-            var irowSetRiid = typeof(IRowset).GUID;
-
-            commandText.SetCommandText(ref riid, queryStr);
-            commandText.Execute(null, ref irowSetRiid, null, out var pcRowsAffected, out var rowsetPointer);
-
-            return rowsetPointer;
+            return rowsetPointer as IRowset;
         }
         catch (Exception ex)
         {
             Logger.LogError("Unexpected error.", ex);
             return null;
         }
+        finally
+        {
+            // Release the command pointer
+            if (commandPtr != null)
+            {
+                Marshal.ReleaseComObject(commandPtr);
+            }
+
+            // Release the session pointer
+            if (sessionPtr != null)
+            {
+                Marshal.ReleaseComObject(sessionPtr);
+            }
+        }
     }
 
-    private unsafe DBPROP? GetPropset(IRowsetInfo rowsetInfo)
+    private IRowsetInfo GetRowsetInfo(IRowset rowset)
+    {
+        if (rowset == null)
+        {
+            return null;
+        }
+
+        var rowsetPtr = IntPtr.Zero;
+        var rowsetInfoPtr = IntPtr.Zero;
+
+        try
+        {
+            // Get the IUnknown pointer for the IRowset object
+            rowsetPtr = Marshal.GetIUnknownForObject(rowset);
+
+            // Query for IRowsetInfo interface
+            var rowsetInfoGuid = typeof(IRowsetInfo).GUID;
+            var res = Marshal.QueryInterface(rowsetPtr, in rowsetInfoGuid, out rowsetInfoPtr);
+            if (res != 0)
+            {
+                Logger.LogError($"Error getting IRowsetInfo interface: {res}");
+                return null;
+            }
+
+            // Marshal the interface pointer to the actual IRowsetInfo object
+            var rowsetInfo = (IRowsetInfo)Marshal.GetObjectForIUnknown(rowsetInfoPtr);
+            return rowsetInfo;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Exception occurred while getting IRowsetInfo. ", ex);
+            return null;
+        }
+        finally
+        {
+            // Release the IRowsetInfo pointer if it was obtained
+            if (rowsetInfoPtr != IntPtr.Zero)
+            {
+                Marshal.Release(rowsetInfoPtr); // Release the IRowsetInfo pointer
+            }
+
+            // Release the IUnknown pointer for the IRowset object
+            if (rowsetPtr != IntPtr.Zero)
+            {
+                Marshal.Release(rowsetPtr);
+            }
+        }
+    }
+
+    private DBPROP? GetPropset(IRowsetInfo rowsetInfo)
     {
         var prgPropSetsPtr = IntPtr.Zero;
 
@@ -314,15 +403,16 @@ internal sealed partial class SearchQuery : IDisposable
                 return null;
             }
 
-            var firstPropSetPtr = (DBPROPSET*)prgPropSetsPtr.ToInt64();
-            var propSet = *firstPropSetPtr;
+            var firstPropSetPtr = new IntPtr(prgPropSetsPtr.ToInt64());
+            var propSet = Marshal.PtrToStructure<DBPROPSET>(firstPropSetPtr);
             if (propSet.cProperties == 0 || propSet.rgProperties == IntPtr.Zero)
             {
                 return null;
             }
 
-            var propPtr = (DBPROP*)propSet.rgProperties.ToInt64();
-            return *propPtr;
+            var propPtr = new IntPtr(propSet.rgProperties.ToInt64());
+            var prop = Marshal.PtrToStructure<DBPROP>(propPtr);
+            return prop;
         }
         catch (Exception ex)
         {
@@ -341,8 +431,7 @@ internal sealed partial class SearchQuery : IDisposable
 
     private uint GetReuseWhereId(IRowset rowset)
     {
-        var rowsetInfo = (IRowsetInfo)rowset;
-
+        var rowsetInfo = GetRowsetInfo(rowset);
         if (rowsetInfo == null)
         {
             return 0;
@@ -354,9 +443,9 @@ internal sealed partial class SearchQuery : IDisposable
             return 0;
         }
 
-        if (prop?.vValue.VarType == VarEnum.VT_UI4)
+        if (prop?.vValue.Anonymous.Anonymous.vt == VARENUM.VT_UI4)
         {
-            var value = prop?.vValue._ulong;
+            var value = prop?.vValue.Anonymous.Anonymous.Anonymous.ulVal;
             return (uint)value;
         }
 
@@ -373,6 +462,18 @@ internal sealed partial class SearchQuery : IDisposable
             Marshal.FreeCoTaskMem(dbPropIdSet.rgPropertyIDs);
         }
 
+        if (reuseRowset != null)
+        {
+            Marshal.ReleaseComObject(reuseRowset);
+            reuseRowset = null;
+        }
+
+        if (currentRowset != null)
+        {
+            Marshal.ReleaseComObject(currentRowset);
+            currentRowset = null;
+        }
+
         queryCompletedEvent?.Dispose();
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchResult.cs

@@ -3,11 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Runtime.InteropServices;
 using ManagedCommon;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;
 using Microsoft.CmdPal.Ext.Indexer.Native;
+using Windows.Win32.System.Com;
+using Windows.Win32.System.Com.StructuredStorage;
+using Windows.Win32.UI.Shell.PropertiesSystem;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
 
@@ -38,9 +39,14 @@ internal sealed class SearchResult
     {
         try
         {
-            propStore.GetValue(NativeHelpers.PropertyKeys.PKEYItemNameDisplay, out var itemNameDisplay);
-            propStore.GetValue(NativeHelpers.PropertyKeys.PKEYItemUrl, out var itemUrl);
-            propStore.GetValue(NativeHelpers.PropertyKeys.PKEYKindText, out var kindText);
+            var key = NativeHelpers.PropertyKeys.PKEYItemNameDisplay;
+            propStore.GetValue(&key, out var itemNameDisplay);
+
+            key = NativeHelpers.PropertyKeys.PKEYItemUrl;
+            propStore.GetValue(&key, out var itemUrl);
+
+            key = NativeHelpers.PropertyKeys.PKEYKindText;
+            propStore.GetValue(&key, out var kindText);
 
             var filePath = GetFilePath(ref itemUrl);
             var isFolder = IsFoder(ref kindText);
@@ -61,34 +67,28 @@ internal sealed class SearchResult
         }
     }
 
-    private static bool IsFoder(ref PropVariant kindText)
+    private static bool IsFoder(ref PROPVARIANT kindText)
     {
         var kindString = GetStringFromPropVariant(ref kindText);
         return string.Equals(kindString, "Folder", StringComparison.OrdinalIgnoreCase);
     }
 
-    private static string GetFilePath(ref PropVariant itemUrl)
+    private static string GetFilePath(ref PROPVARIANT itemUrl)
     {
         var filePath = GetStringFromPropVariant(ref itemUrl);
         filePath = UrlToFilePathConverter.Convert(filePath);
         return filePath;
     }
 
-    private static string GetStringFromPropVariant(ref PropVariant propVariant)
+    private static string GetStringFromPropVariant(ref PROPVARIANT propVariant)
     {
-        if (propVariant.VarType == System.Runtime.InteropServices.VarEnum.VT_LPWSTR)
+        if (propVariant.Anonymous.Anonymous.vt == VARENUM.VT_LPWSTR)
         {
-            var pwszVal = propVariant._ptr;
-
-            if (pwszVal == IntPtr.Zero)
+            var pwszVal = propVariant.Anonymous.Anonymous.Anonymous.pwszVal;
+            if (pwszVal != null)
             {
-                return string.Empty;
+                return pwszVal.ToString();
             }
-
-            // convert to string
-            var str = Marshal.PtrToStringUni(pwszVal);
-
-            return str;
         }
 
         return string.Empty;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManager.cs

@@ -0,0 +1,18 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[CoClass(typeof(CSearchCatalogManagerClass))]
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF50")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchCatalogManager : ISearchCatalogManager
+{
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchCatalogManagerClass.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.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[ComConversionLoss]
+[Guid("AAB49DD5-AD0B-40AE-B654-AE8976BF6BD2")]
+[ClassInterface((short)0)]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public class CSearchCatalogManagerClass : ISearchCatalogManager, CSearchCatalogManager
+{
+    [DispId(1610678272)]
+    public virtual extern string Name
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetCatalogStatus(
+      out object pStatus,
+      out object pPausedReason);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void Reset();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void Reindex();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);
+
+    [DispId(1610678280)]
+    public virtual extern uint ConnectTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678282)]
+    public virtual extern uint DataTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern int NumberOfItems();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void NumberOfItemsToIndex(
+      out int plIncrementalCount,
+      out int plNotificationQueue,
+      out int plHighPriorityQueue);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    public virtual extern string URLBeingIndexed();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object GetPersistentItemsChangedSink();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void RegisterViewForNotification(
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszView,
+      [MarshalAs(UnmanagedType.Interface), In] object pViewChangedSink,
+      out uint pdwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetItemsChangedSink(
+      [MarshalAs(UnmanagedType.Interface), In] object pISearchNotifyInlineSite,
+      [In] ref Guid riid,
+      out IntPtr ppv,
+      out Guid pGUIDCatalogResetSignature,
+      out Guid pGUIDCheckPointSignature,
+      out uint pdwLastCheckPointNumber);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void UnregisterViewForNotification([In] uint dwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetExtensionClusion([MarshalAs(UnmanagedType.LPWStr), In] string pszExtension, [In] int fExclude);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object EnumerateExcludedExtensions();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern CSearchQueryHelper GetQueryHelper();
+
+    [DispId(1610678295)]
+    public virtual extern int DiacriticSensitivity
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern object GetCrawlScopeManager();
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManager.cs

@@ -0,0 +1,18 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[CoClass(typeof(CSearchManagerClass))]
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchManager : ISearchManager
+{
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchManagerClass.cs

@@ -0,0 +1,90 @@
+// 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.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[Guid("7D096C5F-AC08-4F1F-BEB7-5C22C517CE39")]
+[TypeLibType(2)]
+[ClassInterface((short)0)]
+[ComConversionLoss]
+[ComImport]
+public class CSearchManagerClass : ISearchManager, CSearchManager
+{
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+    [DispId(1610678276)]
+    public virtual extern string ProxyName
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678277)]
+    public virtual extern string BypassList
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void SetProxy(
+      [In] object sUseProxy,
+      [In] int fLocalByPassProxy,
+      [In] uint dwPortNumber,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszProxyName,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszByPassList);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    public virtual extern CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] string pszCatalog);
+
+    [DispId(1610678280)]
+    public virtual extern string UserAgent
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+    }
+
+    [DispId(1610678282)]
+    public virtual extern object UseProxy
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678283)]
+    public virtual extern int LocalBypass
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678284)]
+    public virtual extern uint PortNumber
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelper.cs

@@ -0,0 +1,18 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF63")]
+[CoClass(typeof(CSearchQueryHelperClass))]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1715:Identifiers should have correct prefix", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:Interface names should begin with I", Justification = "Using original name from type lib")]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Using original name from type lib")]
+public interface CSearchQueryHelper : ISearchQueryHelper
+{
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/CSearchQueryHelperClass.cs

@@ -0,0 +1,134 @@
+// 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.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[ClassInterface((short)0)]
+[Guid("B271E955-09E1-42E1-9B95-5994A534B613")]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public class CSearchQueryHelperClass : ISearchQueryHelper, CSearchQueryHelper
+{
+    [DispId(1610678272)]
+    public virtual extern string ConnectionString
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678273)]
+    public virtual extern uint QueryContentLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678275)]
+    public virtual extern uint QueryKeywordLocale
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678277)]
+    public virtual extern object QueryTermExpansion
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678279)]
+    public virtual extern object QuerySyntax
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [DispId(1610678281)]
+    public virtual extern string QueryContentProperties
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678283)]
+    public virtual extern string QuerySelectColumns
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678285)]
+    public virtual extern string QueryWhereRestrictions
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [DispId(1610678287)]
+    public virtual extern string QuerySorting
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.LPWStr)]
+    public virtual extern string GenerateSQLFromUserQuery([MarshalAs(UnmanagedType.LPWStr), In] string pszQuery);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    public virtual extern void WriteProperties(
+      [In] int itemID,
+      [In] uint dwNumberOfColumns,
+      [In] ref object pColumns,
+      [In] ref object pValues,
+      [In] ref object pftGatherModifiedTime);
+
+    [DispId(1610678291)]
+    public virtual extern int QueryMaxResults
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommand.cs

@@ -1,21 +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.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A63-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface ICommand
-{
-    void Cancel();
-
-    void Execute([MarshalAs(UnmanagedType.Interface)] object pUnkOuter, ref Guid riid, [Optional][MarshalAs(UnmanagedType.Interface)] object pParams, [Optional]out int pcRowsAffected, out IRowset ppRowset);
-
-    void GetDBSession(ref Guid riid, out IntPtr ppSession);
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ICommandText.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.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Indexer.Indexer.OleDB;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A27-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface ICommandText : ICommand
-{
-    void GetCommandText([Optional] ref Guid pguidDialect, out IntPtr ppwszCommand);
-
-    void SetCommandText(ref Guid rguidDialect, string pwszCommand);
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateCommand.cs

@@ -1,16 +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.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A1D-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBCreateCommand
-{
-    void CreateCommand(IntPtr pUnkOuter, ref Guid riid, out ICommandText ppCommand);
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBCreateSession.cs

@@ -1,20 +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.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A5D-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBCreateSession
-{
-    void CreateSession(IntPtr pUnkOuter, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out object ppDBSession);
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IDBInitialize.cs

@@ -1,22 +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.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733A8B-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IDBInitialize
-{
-    void Initialize();
-
-    void Uninitialize();
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IGetRow.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.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Indexer.Native;
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("0C733AAF-2A1C-11CE-ADE5-00AA0044773D")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IGetRow
-{
-    unsafe void GetRowFromHROW([MarshalAs(UnmanagedType.Interface)] object pUnkOuter, nuint hRow, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IPropertyStore ppUnk);
-
-    unsafe string GetURLFromHROW(nuint hRow);
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/IPropertyStore.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;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
-
-[assembly: System.Runtime.CompilerServices.DisableRuntimeMarshalling]
-
-namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
-
-[Guid("886d8eeb-8cf2-4446-8d02-cdba1dbdcf99")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-public partial interface IPropertyStore
-{
-    uint GetCount();
-
-    PropertyKey GetAt(uint iProp);
-
-    void GetValue(in PropertyKey pkey, out PropVariant pv);
-
-    void SetValue(in PropertyKey pkey, in PropVariant pv);
-
-    void Commit();
-}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchCatalogManager.cs

@@ -5,68 +5,125 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 
 [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF50")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Please do not change the function name")]
-public partial interface ISearchCatalogManager
+[ComConversionLoss]
+[InterfaceType(1)]
+[ComImport]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.OrderingRules", "SA1212:Property accessors should follow order", Justification = "The order of the property accessors must match the order in which the methods were defined in the vtable")]
+public interface ISearchCatalogManager
 {
-    string get_Name();
+    [DispId(1610678272)]
+    string Name
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
 
-    void GetParameter(string pszName, out IntPtr pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
 
-    void SetParameter(string pszName, ref IntPtr pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
 
-    void GetCatalogStatus(out uint pdwStatus, out uint pdwPausedReason);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetCatalogStatus(out object pStatus, out object pPausedReason);
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void Reset();
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void Reindex();
 
-    void ReindexMatchingURLs(string pszPattern);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);
 
-    void ReindexSearchRoot(string pszRoot);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);
 
-    uint get_ConnectTimeout();
+    [DispId(1610678280)]
+    uint ConnectTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 
-    void put_ConnectTimeout(uint dwTimeout);
+    [DispId(1610678282)]
+    uint DataTimeout
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 
-    uint get_DataTimeout();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    int NumberOfItems();
 
-    void put_DataTimeout(uint dwTimeout);
-
-    uint NumberOfItems();
-
-    uint NumberOfItemsToIndex();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void NumberOfItemsToIndex(
+      out int plIncrementalCount,
+      out int plNotificationQueue,
+      out int plHighPriorityQueue);
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     [return: MarshalAs(UnmanagedType.LPWStr)]
     string URLBeingIndexed();
 
-    void GetURLIndexingState(string pszURL, out uint pdwState);
-
-    IntPtr GetPersistentItemsChangedSink();
-
-    void RegisterViewForNotification(string pszView, IntPtr pViewNotify, out uint pdwCookie);
-
-    IntPtr GetItemsChangedSink();
-
-    void UnregisterViewForNotification(uint dwCookie);
-
-    void SetExtensionClusion(string pszExtension, [MarshalAs(UnmanagedType.Bool)] bool fExclude);
-
-    void EnumerateExcludedExtensions();
-
-    [return: MarshalAs(UnmanagedType.Interface)]
     [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    ISearchQueryHelper GetQueryHelper();
+    uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);
 
-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_DiacriticSensitivity();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetPersistentItemsChangedSink();
 
-    void put_DiacriticSensitivity([MarshalAs(UnmanagedType.Bool)] bool fDiacriticSensitive);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void RegisterViewForNotification(
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszView,
+      [MarshalAs(UnmanagedType.Interface), In] object pViewChangedSink,
+      out uint pdwCookie);
 
-    IntPtr GetCrawlScopeManager();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetItemsChangedSink(
+      [MarshalAs(UnmanagedType.Interface), In] object pISearchNotifyInlineSite,
+      [In] ref Guid riid,
+      out IntPtr ppv,
+      out Guid pGUIDCatalogResetSignature,
+      out Guid pGUIDCheckPointSignature,
+      out uint pdwLastCheckPointNumber);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void UnregisterViewForNotification([In] uint dwCookie);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetExtensionClusion([MarshalAs(UnmanagedType.LPWStr), In] string pszExtension, [In] int fExclude);
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object EnumerateExcludedExtensions();
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    CSearchQueryHelper GetQueryHelper();
+
+    [DispId(1610678295)]
+    int DiacriticSensitivity
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: In]
+        set;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
+
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetCrawlScopeManager();
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/ISearchManager.cs

@@ -3,46 +3,87 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 
+[ComConversionLoss]
 [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69")]
-[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
-[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Please do not change the function name")]
-public partial interface ISearchManager
+[InterfaceType(1)]
+[ComImport]
+public interface ISearchManager
 {
-    string GetIndexerVersionStr();
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);
 
-    void GetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] out object pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
 
-    void SetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] ref object pValue);
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
 
-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_UseProxy();
+    [DispId(1610678276)]
+    string ProxyName
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
 
-    string get_BypassList();
+    [DispId(1610678277)]
+    string BypassList
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+    }
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void SetProxy(
-        string pszProxyName,
-        [MarshalAs(UnmanagedType.Bool)] bool fLocalBypass,
-        string pszBypassList,
-        uint dwPortNumber);
+      [In] object sUseProxy,
+      [In] int fLocalByPassProxy,
+      [In] uint dwPortNumber,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszProxyName,
+      [MarshalAs(UnmanagedType.LPWStr), In] string pszByPassList);
 
+    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     [return: MarshalAs(UnmanagedType.Interface)]
-    ISearchCatalogManager GetCatalog(string pszCatalog);
+    CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] string pszCatalog);
 
-    string get_UserAgent();
+    [DispId(1610678280)]
+    string UserAgent
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        get;
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [param: MarshalAs(UnmanagedType.LPWStr)]
+        [param: In]
+        set;
+    }
 
-    void put_UserAgent(string pszUserAgent);
+    [DispId(1610678282)]
+    object UseProxy
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 
-    string get_ProxyName();
+    [DispId(1610678283)]
+    int LocalBypass
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 
-    [return: MarshalAs(UnmanagedType.Bool)]
-    bool get_LocalBypass();
-
-    uint get_PortNumber();
+    [DispId(1610678284)]
+    uint PortNumber
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        get;
+    }
 }