use project reference

<!-- Enter a brief description/summary of your PR here. What does it
fix/what does it change/how was it tested (even manually, if necessary)?
-->
## Summary of the Pull Request
* Use source generation to replace some csWin32 function call.
* Clean up some AOT compatible issues.

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist

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

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

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

If you want to try it out, please see
https://github.com/microsoft/PowerToys/pull/39605

---------

Co-authored-by: Yu Leng <yuleng@microsoft.com>

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

@@ -127,6 +127,8 @@ Naro
 nathancartlidge
 Nemeth
 nielslaute
+Noraa
+noraajunker
 oldnewthing
 onegreatworld
 palenshus

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

@@ -1995,3 +1995,15 @@ culori
 Evercoder
 LCh
 CIELCh
+CLSCTXINPROCALL
+IIDI
+irow
+lcid
+OTHERUNZOOM
+OTHERZOOM
+PARENTCLOSING
+PARENTOPENING
+ppwsz
+rguid
+SCROLLCHILDREN
+VARTYPE

.pipelines/UpdateVersions.ps1

@@ -126,16 +126,15 @@ Get-ChildItem -Path $rootPath -Recurse packages.config | ForEach-Object {
 }
 
 # Update Directory.Packages.props file
-$propsFile = [System.IO.Path]::Combine($rootPath,"Directory.Packages.props")
-if (Test-Path $propsFile) {
-    $file = Read-FileWithEncoding -Path $propsFile
+Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
+    $file = Read-FileWithEncoding -Path $_.FullName
     $content = $file.Content
     if ($content -match '<PackageVersion Include="Microsoft.WindowsAppSDK"') {
         $newVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="' + $WinAppSDKVersion + '" />'
         $oldVersionString = '<PackageVersion Include="Microsoft.WindowsAppSDK" Version="[-.0-9a-zA-Z]*" />'
         $content = $content -replace $oldVersionString, $newVersionString
-        Write-FileWithEncoding -Path $propsFile -Content $content -Encoding $file.encoding
-        Write-Host "Modified " $propsFile
+        Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
+        Write-Host "Modified " $_.FullName
     }
 }
 
@@ -144,8 +143,8 @@ Get-ChildItem -Path $rootPath -Recurse *.vcxproj | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
     $content = $file.Content
     if ($content -match '\\Microsoft.WindowsAppSDK.') {
-        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion + '\'
-        $oldVersionString = '\\Microsoft.WindowsAppSDK.[-.0-9a-zA-Z]*\\'
+        $newVersionString = '\Microsoft.WindowsAppSDK.' + $WinAppSDKVersion
+        $oldVersionString = '\\Microsoft.WindowsAppSDK.(?=[-.0-9a-zA-Z]*\d)[-.0-9a-zA-Z]*'    #positive lookahead for at least a digit
         $content = $content -replace $oldVersionString, $newVersionString
         Write-FileWithEncoding -Path $_.FullName -Content $content -Encoding $file.encoding
         Write-Host "Modified " $_.FullName

.pipelines/verifyAndSetLatestVCToolsVersion.ps1

@@ -1,7 +1,28 @@
 $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 = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSPackages | ? { $_.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
 
-### [@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.
+### [@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.
 
 ### [@cgaarden](https://github.com/cgaarden) - [Christian Gaarden Gaardmark](https://www.onegreatworld.com) 
 Christian contributed New+ utility

Directory.Packages.props

@@ -55,7 +55,7 @@
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />

NOTICE.md

@@ -1472,7 +1472,7 @@ SOFTWARE.
 - Microsoft.Windows.CsWin32 0.2.46-beta
 - Microsoft.Windows.CsWinRT 2.2.0
 - Microsoft.Windows.SDK.BuildTools 10.0.22621.2428
-- Microsoft.WindowsAppSDK 1.7.250401001
+- Microsoft.WindowsAppSDK 1.7.250513003
 - Microsoft.WindowsPackageManager.ComInterop 1.10.340
 - Microsoft.Xaml.Behaviors.WinUI.Managed 2.0.9
 - Microsoft.Xaml.Behaviors.Wpf 1.1.39

PowerToys.sln

@@ -706,6 +706,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegistryPreview.FuzzTests",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.System", "src\modules\cmdpal\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj", "{64B88F02-CD88-4ED8-9624-989A800230F9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FancyZones.FuzzTests", "src\modules\fancyzones\FancyZones.FuzzTests\FancyZones.FuzzTests.csproj", "{0217E86E-3476-9946-DE8E-9D200CEBD47A}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "src\modules\cmdpal\CmdPalKeyboardService\CmdPalKeyboardService.vcxproj", "{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
@@ -2596,6 +2598,14 @@ Global
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2866,6 +2876,7 @@ Global
 		{4E0AE3A4-2EE0-44D7-A2D0-8769977254A0} = {F05E590D-AD46-42BE-9C25-6A63ADD2E3EA}
 		{5702B3CC-8575-48D5-83D8-15BB42269CD3} = {929C1324-22E8-4412-A9A8-80E85F3985A5}
 		{64B88F02-CD88-4ED8-9624-989A800230F9} = {ECB8E0D1-7603-4E5C-AB10-D1E545E6F8E2}
+		{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
 	EndGlobalSection

src/WinAppSdkCppPost.props

@@ -1,18 +0,0 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="ExtensionTargetsAppSdkCppProp">
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
-    <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImportsWinAppSdkCppProp" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.targets'))" />
-  </Target>
-</Project>

src/WinAppSdkCppPre.props

@@ -1,5 +0,0 @@
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.WindowsAppSDK.1.7.250401001\build\native\Microsoft.WindowsAppSDK.props')" />
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
-  <Import Project="$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(MsbuildThisFileDirectory)\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-</Project>

src/common/FilePreviewCommon/QoiImage.cs

@@ -92,6 +92,9 @@ 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)
@@ -153,6 +156,14 @@ 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/common/ManagedCommon/Logger.cs

@@ -6,9 +6,10 @@ using System;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
-
+using System.Threading.Tasks;
 using PowerToys.Interop;
 
 namespace ManagedCommon
@@ -40,25 +41,72 @@ namespace ManagedCommon
         /// <param name="isLocalLow">If the process using Logger is a low-privilege process.</param>
         public static void InitializeLogger(string applicationLogPath, bool isLocalLow = false)
         {
+            string basePath;
             if (isLocalLow)
             {
-                applicationLogPath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath + "\\" + Version;
+                basePath = Environment.GetEnvironmentVariable("userprofile") + "\\appdata\\LocalLow\\Microsoft\\PowerToys" + applicationLogPath;
             }
             else
             {
-                applicationLogPath = Constants.AppDataPath() + applicationLogPath + "\\" + Version;
+                basePath = Constants.AppDataPath() + applicationLogPath;
             }
 
-            if (!Directory.Exists(applicationLogPath))
+            string versionedPath = Path.Combine(basePath, Version);
+
+            if (!Directory.Exists(versionedPath))
             {
-                Directory.CreateDirectory(applicationLogPath);
+                Directory.CreateDirectory(versionedPath);
             }
 
-            var logFilePath = Path.Combine(applicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
+            var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
 
             Trace.AutoFlush = true;
+
+            // Clean up old version log folders
+            Task.Run(() => DeleteOldVersionLogFolders(basePath, versionedPath));
+        }
+
+        /// <summary>
+        /// Deletes old version log folders, keeping only the current version's folder.
+        /// </summary>
+        /// <param name="basePath">The base path to the log files folder.</param>
+        /// <param name="currentVersionPath">The path to the current version's log folder.</param>
+        private static void DeleteOldVersionLogFolders(string basePath, string currentVersionPath)
+        {
+            try
+            {
+                if (!Directory.Exists(basePath))
+                {
+                    return;
+                }
+
+                var dirs = Directory.GetDirectories(basePath)
+                    .Select(d => new DirectoryInfo(d))
+                    .OrderBy(d => d.CreationTime)
+                    .Where(d => !string.Equals(d.FullName, currentVersionPath, StringComparison.OrdinalIgnoreCase))
+                    .Take(3)
+                    .ToList();
+
+                foreach (var directory in dirs)
+                {
+                    try
+                    {
+                        Directory.Delete(directory.FullName, true);
+                        LogInfo($"Deleted old log directory: {directory.FullName}");
+                        Task.Delay(500).Wait();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogError($"Failed to delete old log directory: {directory.FullName}", ex);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogError("Error cleaning up old log folders", ex);
+            }
         }
 
         public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)

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

@@ -152,6 +152,7 @@
   </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>
@@ -194,15 +195,19 @@
   </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/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\WinAppSdkCppPre.props" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -134,16 +136,24 @@
     <ResourceCompile Include="PowerToys.MeasureToolCore.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\WinAppSdkCppPost.props" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
   </Target>
 </Project>

src/modules/MeasureTool/MeasureToolCore/packages.config

@@ -4,5 +4,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>

src/modules/MouseWithoutBorders/ModuleInterface/dllmain.cpp

@@ -13,6 +13,7 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/processApi.h>
 #include <common/utils/elevation.h>
+#include <common/utils/logger_helper.h>
 
 HINSTANCE g_hInst_MouseWithoutBorders = 0;
 
@@ -409,9 +410,12 @@ public:
     {
         app_name = L"MouseWithoutBorders";
         app_key = app_name;
-        std::filesystem::path logFilePath(PTSettingsHelper::get_module_save_folder_location(app_key));
-        logFilePath.append(LogSettings::mouseWithoutBordersLogPath);
-        Logger::init(LogSettings::mouseWithoutBordersLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
+
+        LoggerHelpers::init_logger(app_key, L"ModuleInterface", LogSettings::mouseWithoutBordersLoggerName);
+
+        std::filesystem::path oldLogPath(PTSettingsHelper::get_module_save_folder_location(app_key));
+        oldLogPath.append("LogsModuleInterface");
+        LoggerHelpers::delete_old_log_folder(oldLogPath);
 
         try
         {

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

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
@@ -9,7 +9,7 @@
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.46-beta" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250401001" />
+    <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.5" />

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TemplateCmdPalExtension</RootNamespace>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>

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

@@ -11,6 +11,7 @@
                 <!--  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/Controls/CommandBar.xaml

@@ -34,8 +34,13 @@
                 Orientation="Vertical"
                 Spacing="4" />
 
-            <!--  Template for actions in the mode actions dropdown button  -->
-            <DataTemplate x:Key="ContextMenuViewModelTemplate" x:DataType="viewmodels:CommandContextItemViewModel">
+            <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">
                 <Grid AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
@@ -63,6 +68,38 @@
                         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>
 
@@ -237,7 +274,7 @@
                                 Margin="-16,-12,-16,-12"
                                 IsItemClickEnabled="True"
                                 ItemClick="CommandsDropdown_ItemClick"
-                                ItemTemplate="{StaticResource ContextMenuViewModelTemplate}"
+                                ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
                                 ItemsSource="{x:Bind ViewModel.ContextMenu.FilteredItems, Mode=OneWay}"
                                 KeyDown="CommandsDropdown_KeyDown"
                                 SelectionMode="Single">

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

@@ -0,0 +1,21 @@
+// 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/Microsoft.CmdPal.UI.csproj

@@ -39,9 +39,7 @@
   </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/Styles/TextBlock.xaml

@@ -0,0 +1,27 @@
+<?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/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup>
     <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
   </PropertyGroup>
   <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
   <PropertyGroup Label="Globals">

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 it's 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 its 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.Calc/Helper/CalculateHelper.cs

@@ -35,7 +35,7 @@ public static class CalculateHelper
     {
         if (string.IsNullOrWhiteSpace(input))
         {
-            throw new ArgumentNullException(paramName: nameof(input));
+            return false;
         }
 
         if (!RegValidExpressChar.IsMatch(input))

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Helper/QueryHelper.cs

@@ -23,6 +23,9 @@ public static partial class QueryHelper
         CultureInfo inputCulture = settings.InputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
         CultureInfo outputCulture = settings.OutputUseEnglishFormat ? new CultureInfo("en-us") : CultureInfo.CurrentCulture;
 
+        // In case the user pastes a query with a leading =
+        query = query.TrimStart('=');
+
         // Happens if the user has only typed the action key so far
         if (string.IsNullOrEmpty(query))
         {
@@ -32,6 +35,11 @@ public static partial class QueryHelper
         NumberTranslator translator = NumberTranslator.Create(inputCulture, new CultureInfo("en-US"));
         var input = translator.Translate(query.Normalize(NormalizationForm.FormKC));
 
+        if (string.IsNullOrWhiteSpace(input))
+        {
+            return ErrorHandler.OnError(isFallbackSearch, query, Properties.Resources.calculator_expression_empty);
+        }
+
         if (!CalculateHelper.InputValid(input))
         {
             return null;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.Designer.cs

@@ -132,6 +132,15 @@ namespace Microsoft.CmdPal.Ext.Calc.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please enter an expression.
+        /// </summary>
+        public static string calculator_expression_empty {
+            get {
+                return ResourceManager.GetString("calculator_expression_empty", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Expression wrong or incomplete.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/Properties/Resources.resx

@@ -199,4 +199,7 @@
   <data name="calculator_copy_binary" xml:space="preserve">
     <value>Copy binary</value>
   </data>
+  <data name="calculator_expression_empty" xml:space="preserve">
+    <value>Please enter an expression</value>
+  </data>
 </root>

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

@@ -3,6 +3,7 @@
 // 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;
@@ -13,6 +14,7 @@ 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;
 
@@ -27,19 +29,16 @@ 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)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
-                lpVerb = propertiesPCWSTR,
-                lpFile = filenamePCWSTR,
+                cbSize = (uint)sizeof(SHELLEXECUTEINFOW),
+                lpVerb = propertiesPtr,
+                lpFile = filenamePtr,
                 nShow = (int)SHOW_WINDOW_CMD.SW_SHOW,
                 fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
             };
 
-            return PInvoke.ShellExecuteEx(ref info);
+            return ShellExecuteEx(ref info);
         }
         finally
         {

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

@@ -2,6 +2,8 @@
 // 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;
@@ -11,6 +13,7 @@ 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;
 
@@ -25,19 +28,16 @@ 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)Marshal.SizeOf<SHELLEXECUTEINFOW>(),
-                lpVerb = verbPCWSTR,
-                lpFile = filenamePCWSTR,
+                cbSize = (uint)sizeof(SHELLEXECUTEINFOW),
+                lpVerb = verbPtr,
+                lpFile = filenamePtr,
                 nShow = (int)SHOW_WINDOW_CMD.SW_SHOWNORMAL,
                 fMask = NativeHelpers.SEEMASKINVOKEIDLIST,
             };
 
-            return PInvoke.ShellExecuteEx(ref info);
+            return 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 Windows.Win32;
-using Windows.Win32.System.Com;
-using Windows.Win32.System.Search;
+using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+using Microsoft.CmdPal.Ext.Indexer.Native;
 
 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,20 +28,29 @@ internal static class DataSourceManager
 
     private static bool InitializeDataSource()
     {
-        var hr = PInvoke.CoCreateInstance(CLSIDCollatorDataSource, null, CLSCTX.CLSCTX_INPROC_SERVER, typeof(IDBInitialize).GUID, out var dataSourceObj);
+        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);
         if (hr != 0)
         {
             Logger.LogError("CoCreateInstance failed: " + hr);
             return false;
         }
 
-        if (dataSourceObj == null)
+        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)
         {
             Logger.LogError("CoCreateInstance failed: dataSourceObj is null");
             return false;
         }
 
-        _dataSource = (IDBInitialize)dataSourceObj;
         _dataSource.Initialize();
 
         return true;

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

@@ -3,6 +3,8 @@
 // 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;
 
@@ -16,6 +18,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,40 +4,38 @@
 
 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")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IRowset
+[GeneratedComInterface]
+public partial interface IRowset
 {
-    [PreserveSig]
-    int AddRefRows(
+    void AddRefRows(
         uint cRows,
-        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
-        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
 
-    [PreserveSig]
-    int GetData(
+    void GetData(
         IntPtr hRow,
         IntPtr hAccessor,
         IntPtr pData);
 
-    [PreserveSig]
-    int GetNextRows(
+    void GetNextRows(
        IntPtr hReserved,
        long lRowsOffset,
        long cRows,
        out uint pcRowsObtained,
        out IntPtr prghRows);
 
-    [PreserveSig]
-    int ReleaseRows(
+    void ReleaseRows(
         uint cRows,
-        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] IntPtr[] rghRows,
         IntPtr rgRowOptions,
-        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
-        [Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] uint[] rgRefCounts,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] int[] rgRowStatus);
+
+    void RestartPosition(nuint hReserved);
 }

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")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IRowsetInfo
+[GeneratedComInterface]
+public partial interface IRowsetInfo
 {
     [PreserveSig]
     int GetProperties(
         uint cPropertyIDSets,
-        [In, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
+        [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 0)] DBPROPIDSET[] rgPropertyIDSets,
         out ulong pcPropertySets,
         out IntPtr prgPropertySets);
 
     [PreserveSig]
     int GetReferencedRowset(
         uint iOrdinal,
-        [In] ref Guid riid,
-        [Out, MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);
+        ref Guid riid,
+        [MarshalAs(UnmanagedType.Interface)] out object ppReferencedRowset);
 
     [PreserveSig]
     int GetSpecification(
-        [In] ref Guid riid,
-        [Out, MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
+        ref Guid riid,
+        [MarshalAs(UnmanagedType.Interface)] out object ppSpecification);
 }

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

@@ -8,12 +8,10 @@ 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 Windows.Win32;
-using Windows.Win32.System.Com;
-using Windows.Win32.System.Search;
-using Windows.Win32.UI.Shell.PropertiesSystem;
+using static Microsoft.CmdPal.Ext.Indexer.Native.NativeHelpers;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
 
@@ -120,11 +118,6 @@ 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;
@@ -148,13 +141,12 @@ internal sealed partial class SearchQuery : IDisposable
 
     private bool HandleRow(IGetRow getRow, nuint rowHandle)
     {
-        object propertyStorePtr = null;
-
         try
         {
-            getRow.GetRowFromHROW(null, rowHandle, typeof(IPropertyStore).GUID, out propertyStorePtr);
+            var riid = CsWin32GUID.PropertyStore;
+
+            getRow.GetRowFromHROW(null, rowHandle, ref riid, out var propertyStore);
 
-            var propertyStore = (IPropertyStore)propertyStorePtr;
             if (propertyStore == null)
             {
                 Logger.LogError("Failed to get IPropertyStore interface");
@@ -176,14 +168,6 @@ 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)
@@ -194,16 +178,17 @@ internal sealed partial class SearchQuery : IDisposable
             return false;
         }
 
-        if (currentRowset is not IGetRow)
+        IGetRow getRow = null;
+
+        try
+        {
+            getRow = (IGetRow)currentRowset;
+        }
+        catch (Exception)
         {
             Logger.LogInfo("Reset the current rowset");
             ExecuteSyncInternal();
-        }
-
-        if (currentRowset is not IGetRow getRow)
-        {
-            Logger.LogError("Rowset does not support IGetRow interface");
-            return false;
+            getRow = (IGetRow)currentRowset;
         }
 
         uint rowCountReturned;
@@ -211,12 +196,7 @@ internal sealed partial class SearchQuery : IDisposable
 
         try
         {
-            var res = currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
-            if (res < 0)
-            {
-                Logger.LogError($"Error fetching rows: {res}");
-                return false;
-            }
+            currentRowset.GetNextRows(IntPtr.Zero, offset, limit, out rowCountReturned, out prghRows);
 
             if (rowCountReturned == 0)
             {
@@ -237,11 +217,7 @@ internal sealed partial class SearchQuery : IDisposable
                 }
             }
 
-            res = currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
-            if (res != 0)
-            {
-                Logger.LogError($"Error releasing rows: {res}");
-            }
+            currentRowset.ReleaseRows(rowCountReturned, rowHandles, IntPtr.Zero, null, null);
 
             Marshal.FreeCoTaskMem(prghRows);
             prghRows = IntPtr.Zero;
@@ -268,11 +244,6 @@ internal sealed partial class SearchQuery : IDisposable
         var rowset = ExecuteCommand(queryStr);
         if (rowset != null)
         {
-            if (reuseRowset != null)
-            {
-                Marshal.ReleaseComObject(reuseRowset);
-            }
-
             reuseRowset = rowset;
             reuseWhereID = GetReuseWhereId(reuseRowset);
         }
@@ -280,110 +251,50 @@ internal sealed partial class SearchQuery : IDisposable
 
     private unsafe IRowset ExecuteCommand(string queryStr)
     {
-        object sessionPtr = null;
-        object commandPtr = null;
+        if (string.IsNullOrEmpty(queryStr))
+        {
+            return null;
+        }
 
         try
         {
             var session = (IDBCreateSession)DataSourceManager.GetDataSource();
-            session.CreateSession(null, typeof(IDBCreateCommand).GUID, out sessionPtr);
-            if (sessionPtr == null)
+            var guid = typeof(IDBCreateCommand).GUID;
+            session.CreateSession(IntPtr.Zero, ref guid, out var ppDBSession);
+
+            if (ppDBSession == null)
             {
                 Logger.LogError("CreateSession failed");
                 return null;
             }
 
-            var createCommand = (IDBCreateCommand)sessionPtr;
-            createCommand.CreateCommand(null, typeof(ICommandText).GUID, out commandPtr);
-            if (commandPtr == null)
-            {
-                Logger.LogError("CreateCommand failed");
-                return null;
-            }
+            var createCommand = (IDBCreateCommand)ppDBSession;
+            guid = typeof(ICommandText).GUID;
+            createCommand.CreateCommand(IntPtr.Zero, ref guid, out ICommandText commandText);
 
-            var commandText = (ICommandText)commandPtr;
             if (commandText == null)
             {
                 Logger.LogError("Failed to get ICommandText interface");
                 return null;
             }
 
-            commandText.SetCommandText(in NativeHelpers.OleDb.DbGuidDefault, queryStr);
-            commandText.Execute(null, typeof(IRowset).GUID, null, null, out var rowsetPointer);
+            var riid = NativeHelpers.OleDb.DbGuidDefault;
 
-            return rowsetPointer as IRowset;
+            var irowSetRiid = typeof(IRowset).GUID;
+
+            commandText.SetCommandText(ref riid, queryStr);
+            commandText.Execute(null, ref irowSetRiid, null, out var pcRowsAffected, out var rowsetPointer);
+
+            return rowsetPointer;
         }
         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 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)
+    private unsafe DBPROP? GetPropset(IRowsetInfo rowsetInfo)
     {
         var prgPropSetsPtr = IntPtr.Zero;
 
@@ -403,16 +314,15 @@ internal sealed partial class SearchQuery : IDisposable
                 return null;
             }
 
-            var firstPropSetPtr = new IntPtr(prgPropSetsPtr.ToInt64());
-            var propSet = Marshal.PtrToStructure<DBPROPSET>(firstPropSetPtr);
+            var firstPropSetPtr = (DBPROPSET*)prgPropSetsPtr.ToInt64();
+            var propSet = *firstPropSetPtr;
             if (propSet.cProperties == 0 || propSet.rgProperties == IntPtr.Zero)
             {
                 return null;
             }
 
-            var propPtr = new IntPtr(propSet.rgProperties.ToInt64());
-            var prop = Marshal.PtrToStructure<DBPROP>(propPtr);
-            return prop;
+            var propPtr = (DBPROP*)propSet.rgProperties.ToInt64();
+            return *propPtr;
         }
         catch (Exception ex)
         {
@@ -431,7 +341,8 @@ internal sealed partial class SearchQuery : IDisposable
 
     private uint GetReuseWhereId(IRowset rowset)
     {
-        var rowsetInfo = GetRowsetInfo(rowset);
+        var rowsetInfo = (IRowsetInfo)rowset;
+
         if (rowsetInfo == null)
         {
             return 0;
@@ -443,9 +354,9 @@ internal sealed partial class SearchQuery : IDisposable
             return 0;
         }
 
-        if (prop?.vValue.Anonymous.Anonymous.vt == VARENUM.VT_UI4)
+        if (prop?.vValue.VarType == VarEnum.VT_UI4)
         {
-            var value = prop?.vValue.Anonymous.Anonymous.Anonymous.ulVal;
+            var value = prop?.vValue._ulong;
             return (uint)value;
         }
 
@@ -462,18 +373,6 @@ 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,12 +3,11 @@
 // 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;
 
@@ -39,14 +38,9 @@ internal sealed class SearchResult
     {
         try
         {
-            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);
+            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 filePath = GetFilePath(ref itemUrl);
             var isFolder = IsFoder(ref kindText);
@@ -67,28 +61,34 @@ 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.Anonymous.Anonymous.vt == VARENUM.VT_LPWSTR)
+        if (propVariant.VarType == System.Runtime.InteropServices.VarEnum.VT_LPWSTR)
         {
-            var pwszVal = propVariant.Anonymous.Anonymous.Anonymous.pwszVal;
-            if (pwszVal != null)
+            var pwszVal = propVariant._ptr;
+
+            if (pwszVal == IntPtr.Zero)
             {
-                return pwszVal.ToString();
+                return string.Empty;
             }
+
+            // 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

@@ -1,18 +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.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

@@ -1,131 +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.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

@@ -1,18 +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.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

@@ -1,90 +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.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

@@ -1,18 +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.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

@@ -1,134 +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.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

@@ -0,0 +1,21 @@
+// 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

@@ -0,0 +1,23 @@
+// 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

@@ -0,0 +1,16 @@
+// 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

@@ -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;
+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

@@ -0,0 +1,22 @@
+// 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

@@ -0,0 +1,23 @@
+// 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

@@ -0,0 +1,26 @@
+// 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,125 +5,68 @@
 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")]
-[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
+[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
 {
-    [DispId(1610678272)]
-    string Name
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        get;
-    }
+    string get_Name();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+    void GetParameter(string pszName, out IntPtr pValue);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+    void SetParameter(string pszName, ref IntPtr pValue);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void GetCatalogStatus(out object pStatus, out object pPausedReason);
+    void GetCatalogStatus(out uint pdwStatus, out uint pdwPausedReason);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void Reset();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void Reindex();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);
+    void ReindexMatchingURLs(string pszPattern);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);
+    void ReindexSearchRoot(string pszRoot);
 
-    [DispId(1610678280)]
-    uint ConnectTimeout
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    uint get_ConnectTimeout();
 
-    [DispId(1610678282)]
-    uint DataTimeout
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    void put_ConnectTimeout(uint dwTimeout);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    int NumberOfItems();
+    uint get_DataTimeout();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void NumberOfItemsToIndex(
-      out int plIncrementalCount,
-      out int plNotificationQueue,
-      out int plHighPriorityQueue);
+    void put_DataTimeout(uint dwTimeout);
+
+    uint NumberOfItems();
+
+    uint NumberOfItemsToIndex();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     [return: MarshalAs(UnmanagedType.LPWStr)]
     string URLBeingIndexed();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);
+    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();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     [return: MarshalAs(UnmanagedType.Interface)]
-    object GetPersistentItemsChangedSink();
-
     [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void RegisterViewForNotification(
-      [MarshalAs(UnmanagedType.LPWStr), In] string pszView,
-      [MarshalAs(UnmanagedType.Interface), In] object pViewChangedSink,
-      out uint pdwCookie);
+    ISearchQueryHelper GetQueryHelper();
 
-    [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);
+    [return: MarshalAs(UnmanagedType.Bool)]
+    bool get_DiacriticSensitivity();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void UnregisterViewForNotification([In] uint dwCookie);
+    void put_DiacriticSensitivity([MarshalAs(UnmanagedType.Bool)] bool fDiacriticSensitive);
 
-    [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();
+    IntPtr GetCrawlScopeManager();
 }

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

@@ -3,87 +3,46 @@
 // 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")]
-[InterfaceType(1)]
-[ComImport]
-public interface ISearchManager
+[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
 {
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);
+    string GetIndexerVersionStr();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+    void GetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] out object pValue);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+    void SetParameter(string pszName, [MarshalAs(UnmanagedType.Interface)] ref object pValue);
 
-    [DispId(1610678276)]
-    string ProxyName
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        get;
-    }
+    [return: MarshalAs(UnmanagedType.Bool)]
+    bool get_UseProxy();
 
-    [DispId(1610678277)]
-    string BypassList
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        get;
-    }
+    string get_BypassList();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void SetProxy(
-      [In] object sUseProxy,
-      [In] int fLocalByPassProxy,
-      [In] uint dwPortNumber,
-      [MarshalAs(UnmanagedType.LPWStr), In] string pszProxyName,
-      [MarshalAs(UnmanagedType.LPWStr), In] string pszByPassList);
+        string pszProxyName,
+        [MarshalAs(UnmanagedType.Bool)] bool fLocalBypass,
+        string pszBypassList,
+        uint dwPortNumber);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     [return: MarshalAs(UnmanagedType.Interface)]
-    CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] string pszCatalog);
+    ISearchCatalogManager GetCatalog(string pszCatalog);
 
-    [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;
-    }
+    string get_UserAgent();
 
-    [DispId(1610678282)]
-    object UseProxy
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    void put_UserAgent(string pszUserAgent);
 
-    [DispId(1610678283)]
-    int LocalBypass
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    string get_ProxyName();
 
-    [DispId(1610678284)]
-    uint PortNumber
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    [return: MarshalAs(UnmanagedType.Bool)]
+    bool get_LocalBypass();
+
+    uint get_PortNumber();
 }

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

@@ -5,130 +5,74 @@
 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-00C04FB6EF63")]
-[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 ISearchQueryHelper
+[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "I don't want to change the name")]
+public partial interface ISearchQueryHelper
 {
-    [DispId(1610678272)]
-    string ConnectionString
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [return: MarshalAs(UnmanagedType.LPWStr)]
-        get;
-    }
+    string GetConnectionString();
 
-    [DispId(1610678273)]
-    uint QueryContentLocale
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    void SetQueryContentLocale(int lcid);
 
-    [DispId(1610678275)]
-    uint QueryKeywordLocale
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    uint GetQueryContentLocale();
 
-    [DispId(1610678277)]
-    object QueryTermExpansion
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    void SetQueryKeywordLocale(int lcid);
 
-    [DispId(1610678279)]
-    object QuerySyntax
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    uint GetQueryKeywordLocale();
 
-    [DispId(1610678281)]
-    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;
-    }
+    void SetQueryTermExpansion(SEARCH_TERM_EXPANSION expandTerms);
 
-    [DispId(1610678283)]
-    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;
-    }
+    void GetQueryTermExpansion(out SEARCH_TERM_EXPANSION pExpandTerms);
 
-    [DispId(1610678285)]
-    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;
-    }
+    void SetQuerySyntax(SEARCH_QUERY_SYNTAX querySyntax);
 
-    [DispId(1610678287)]
-    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;
-    }
+    [return: MarshalAs(UnmanagedType.Interface)]
+    object GetQuerySyntax();
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-    [return: MarshalAs(UnmanagedType.LPWStr)]
-    string GenerateSQLFromUserQuery([MarshalAs(UnmanagedType.LPWStr), In] string pszQuery);
+    void SetQueryContentProperties(string pszContentProperties);
+
+    string GetQueryContentProperties();
+
+    void SetQuerySelectColumns(string pszColumns);
+
+    string GetQuerySelectColumns();
+
+    void SetQueryWhereRestrictions(string pszRestrictions);
+
+    string GetQueryWhereRestrictions();
+
+    void SetQuerySorting(string pszSorting);
+
+    string GetQuerySorting();
+
+    string GenerateSQLFromUserQuery(string pszQuery);
 
-    [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
     void WriteProperties(
-      [In] int itemID,
-      [In] uint dwNumberOfColumns,
-      [In] ref object pColumns,
-      [In] ref object pValues,
-      [In] ref object pftGatherModifiedTime);
+      int itemID,
+      uint dwNumberOfColumns,
+      [MarshalAs(UnmanagedType.Interface)] ref object pColumns,
+      [MarshalAs(UnmanagedType.Interface)] ref object pValues,
+      [MarshalAs(UnmanagedType.Interface)] ref object pftGatherModifiedTime);
 
-    [DispId(1610678291)]
-    int QueryMaxResults
-    {
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        [param: In]
-        set;
-        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
-        get;
-    }
+    void SetQueryMaxResults(int lMaxResults);
+
+    int GetQueryMaxResults();
+}
+
+public enum SEARCH_TERM_EXPANSION
+{
+    SEARCH_TERM_NO_EXPANSION,
+    SEARCH_TERM_PREFIX_ALL,
+    SEARCH_TERM_STEM_ALL,
+}
+
+public enum SEARCH_QUERY_SYNTAX
+{
+    SEARCH_NO_QUERY_SYNTAX,
+    SEARCH_ADVANCED_QUERY_SYNTAX,
+    SEARCH_NATURAL_QUERY_SYNTAX,
 }

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

@@ -0,0 +1,70 @@
+// 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 VARTYPE = System.Runtime.InteropServices.VarEnum;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+[StructLayout(LayoutKind.Explicit, Pack = 8)]
+public struct PropVariant
+{
+    /// <summary>Value type tag.</summary>
+    [FieldOffset(0)]
+    public ushort vt;
+
+    [FieldOffset(2)]
+    public ushort wReserved1;
+
+    /// <summary>Reserved for future use.</summary>
+    [FieldOffset(4)]
+    public ushort wReserved2;
+
+    /// <summary>Reserved for future use.</summary>
+    [FieldOffset(6)]
+    public ushort wReserved3;
+
+    /// <summary>The decimal value when VT_DECIMAL.</summary>
+    [FieldOffset(0)]
+    internal decimal _decimal;
+
+    /// <summary>The raw data pointer.</summary>
+    [FieldOffset(8)]
+    internal IntPtr _ptr;
+
+    /// <summary>The FILETIME when VT_FILETIME.</summary>
+    [FieldOffset(8)]
+    internal System.Runtime.InteropServices.ComTypes.FILETIME _ft;
+
+    [FieldOffset(8)]
+    internal BLOB _blob;
+
+    /// <summary>The value when a numeric value less than 8 bytes.</summary>
+    [FieldOffset(8)]
+    internal ulong _ulong;
+
+    public PropVariant(string value)
+    {
+        ArgumentNullException.ThrowIfNull(value);
+        vt = (ushort)VarEnum.VT_LPWSTR;
+        _ptr = Marshal.StringToCoTaskMemUni(value);
+    }
+
+    public VarEnum VarType { get => (VarEnum)vt; set => vt = (ushort)(VARTYPE)value; }
+}
+
+[StructLayout(LayoutKind.Sequential, Pack = 0)]
+public struct BLOB
+{
+    /// <summary>The count of bytes</summary>
+    public uint cbSize;
+
+    /// <summary>A pointer to the allocated array of bytes.</summary>
+    public IntPtr pBlobData;
+}
+
+#pragma warning restore SA1307 // Accessible fields should begin with upper-case letter

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SystemSearch/PropertyKey.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.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+
+[StructLayout(LayoutKind.Sequential)]
+public struct PropertyKey
+{
+    public Guid FmtID;
+
+    public uint PID;
+
+    public PropertyKey(Guid fmtid, uint pid)
+    {
+        this.FmtID = fmtid;
+        this.PID = pid;
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/Utils/QueryStringBuilder.cs

@@ -2,12 +2,17 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
+using Microsoft.CmdPal.Ext.Indexer.Native;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Indexer.Utils;
 
-internal sealed class QueryStringBuilder
+internal sealed partial class QueryStringBuilder
 {
     private const string Properties = "System.ItemUrl, System.ItemNameDisplay, path, System.Search.EntryID, System.Kind, System.KindText";
     private const string SystemIndex = "SystemIndex";
@@ -24,16 +29,40 @@ internal sealed class QueryStringBuilder
     {
         if (queryHelper == null)
         {
-            var searchManager = new CSearchManager();
-            ISearchCatalogManager catalogManager = searchManager.GetCatalog(SystemIndex);
-            queryHelper = catalogManager.GetQueryHelper();
+            ComWrappers cw = new StrategyBasedComWrappers();
 
-            queryHelper.QuerySelectColumns = Properties;
-            queryHelper.QueryContentProperties = "System.FileName";
-            queryHelper.QuerySorting = OrderConditions;
+            var hr = NativeMethods.CoCreateInstance(ref Unsafe.AsRef(in NativeHelpers.CsWin32GUID.CLSIDSearchManager), IntPtr.Zero, NativeHelpers.CLSCTXINPROCALL, ref Unsafe.AsRef(in NativeHelpers.CsWin32GUID.IIDISearchManager), out var searchManagerPtr);
+            if (hr != 0)
+            {
+                throw new ArgumentException($"Failed to create SearchManager instance. HR: 0x{hr:X}");
+            }
+
+            var searchManager = (ISearchManager)cw.GetOrCreateObjectForComInstance(
+                searchManagerPtr, CreateObjectFlags.None);
+
+            if (searchManager == null)
+            {
+                throw new ArgumentException("Failed to get ISearchManager interface");
+            }
+
+            ISearchCatalogManager catalogManager = searchManager.GetCatalog(SystemIndex);
+            if (catalogManager == null)
+            {
+                throw new ArgumentException($"Failed to get catalog manager for {SystemIndex}");
+            }
+
+            queryHelper = catalogManager.GetQueryHelper();
+            if (queryHelper == null)
+            {
+                throw new ArgumentException("Failed to get query helper from catalog manager");
+            }
+
+            queryHelper.SetQuerySelectColumns(Properties);
+            queryHelper.SetQueryContentProperties("System.FileName");
+            queryHelper.SetQuerySorting(OrderConditions);
         }
 
-        queryHelper.QueryWhereRestrictions = "AND " + ScopeFileConditions + "AND ReuseWhere(" + whereId.ToString(CultureInfo.InvariantCulture) + ")";
+        queryHelper.SetQueryWhereRestrictions("AND " + ScopeFileConditions + "AND ReuseWhere(" + whereId.ToString(CultureInfo.InvariantCulture) + ")");
         return queryHelper.GenerateSQLFromUserQuery(searchText);
     }
 }

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

@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
     <RootNamespace>Microsoft.CmdPal.Ext.Indexer</RootNamespace>
-
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-
+	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -46,4 +46,9 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+	<AdditionalFiles Include="NativeMethods.txt" />
+	<AdditionalFiles Include="NativeMethods.json" />
+  </ItemGroup>
+
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Native/NativeHelpers.cs

@@ -1,25 +1,34 @@
 // 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.UI.Shell.PropertiesSystem;
+using Microsoft.CmdPal.Ext.Indexer.Indexer.SystemSearch;
 
 namespace Microsoft.CmdPal.Ext.Indexer.Native;
 
-internal sealed class NativeHelpers
+public sealed partial class NativeHelpers
 {
     public const uint SEEMASKINVOKEIDLIST = 12;
 
-    internal static class PropertyKeys
+    public const uint CLSCTXINPROCALL = 0x17;
+
+    public struct PropertyKeys
     {
-        public static readonly PROPERTYKEY PKEYItemNameDisplay = new() { fmtid = new System.Guid("B725F130-47EF-101A-A5F1-02608C9EEBAC"), pid = 10 };
-        public static readonly PROPERTYKEY PKEYItemUrl = new() { fmtid = new System.Guid("49691C90-7E17-101A-A91C-08002B2ECDA9"), pid = 9 };
-        public static readonly PROPERTYKEY PKEYKindText = new() { fmtid = new System.Guid("F04BEF95-C585-4197-A2B7-DF46FDC9EE6D"), pid = 100 };
+        public static readonly PropertyKey PKEYItemNameDisplay = new() { FmtID = new System.Guid("B725F130-47EF-101A-A5F1-02608C9EEBAC"), PID = 10 };
+        public static readonly PropertyKey PKEYItemUrl = new() { FmtID = new System.Guid("49691C90-7E17-101A-A91C-08002B2ECDA9"), PID = 9 };
+        public static readonly PropertyKey PKEYKindText = new() { FmtID = new System.Guid("F04BEF95-C585-4197-A2B7-DF46FDC9EE6D"), PID = 100 };
     }
 
-    internal static class OleDb
+    public static class OleDb
     {
         public static readonly Guid DbGuidDefault = new("C8B521FB-5CF3-11CE-ADE5-00AA0044773D");
     }
+
+    public static class CsWin32GUID
+    {
+        public static readonly Guid CLSIDSearchManager = new Guid("7D096C5F-AC08-4F1F-BEB7-5C22C517CE39");
+        public static readonly Guid IIDISearchManager = new Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69");
+        public static readonly Guid CLSIDCollatorDataSource = new Guid("9E175B8B-F52A-11D8-B9A5-505054503030");
+        public static readonly Guid PropertyStore = new Guid("886D8EEB-8CF2-4446-8D02-CDBA1DBDCF99");
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Native/NativeMethods.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.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
+using Windows.Win32.UI.Shell;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Native;
+
+public sealed partial class NativeMethods
+{
+    [LibraryImport("ole32.dll")]
+    [return: MarshalAs(UnmanagedType.U4)]
+    public static partial uint CoCreateInstance(
+        ref Guid rclsid,
+        IntPtr pUnkOuter,
+        uint dwClsContext,
+        ref Guid riid,
+        out IntPtr rReturnedComObject);
+
+    [LibraryImport("SHELL32.dll", EntryPoint = "ShellExecuteExW", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static partial bool ShellExecuteEx(ref SHELLEXECUTEINFOW lpExecInfo);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    public struct SHELLEXECUTEINFOW
+    {
+        public uint cbSize;
+        public uint fMask;
+        public IntPtr hwnd;
+
+        public IntPtr lpVerb;
+        public IntPtr lpFile;
+        public IntPtr lpParameters;
+        public IntPtr lpDirectory;
+        public int nShow;
+        public IntPtr hInstApp;
+        public IntPtr lpIDList;
+        public IntPtr lpClass;
+        public IntPtr hkeyClass;
+        public uint dwHotKey;
+        public IntPtr hIconOrMonitor;
+        public IntPtr hProcess;
+    }
+}

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

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json",
+  "allowMarshaling": false,
+  "emitSingleFile": false,
+  "public": true
+}

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

@@ -1,11 +1,2 @@
 DBID
-SHOW_WINDOW_CMD
-CoCreateInstance
-GetErrorInfo
-ICommandText
-IDBCreateCommand
-IDBCreateSession
-IDBInitialize
-IGetRow
-IPropertyStore
-ShellExecuteEx
+SHOW_WINDOW_CMD

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Native.cs

@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Ext.System.Helpers;
-
-[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
-{
-    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.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj

@@ -32,6 +32,11 @@
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AdditionalFiles Include="NativeMethods.txt" />
+    <AdditionalFiles Include="NativeMethods.json" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />

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

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

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WindowsPackageManager.Interop/WindowsPackageManagerStandardFactory.cs

@@ -20,20 +20,25 @@ public class WindowsPackageManagerStandardFactory : WindowsPackageManagerFactory
     protected override T CreateInstance<T>(Guid clsid, Guid iid)
     {
         var pUnknown = IntPtr.Zero;
-        try
+        unsafe
         {
-            var hr = PInvoke.CoCreateInstance(clsid, null, CLSCTX.CLSCTX_ALL, iid, out var result);
-            Marshal.ThrowExceptionForHR(hr);
-            pUnknown = Marshal.GetIUnknownForObject(result);
-            return MarshalGeneric<T>.FromAbi(pUnknown);
-        }
-        finally
-        {
-            // CoCreateInstance and FromAbi both AddRef on the native object.
-            // Release once to prevent memory leak.
-            if (pUnknown != IntPtr.Zero)
+            try
             {
-                Marshal.Release(pUnknown);
+                var hr = PInvoke.CoCreateInstance(clsid, null, CLSCTX.CLSCTX_ALL, iid, out var result);
+                Marshal.ThrowExceptionForHR(hr);
+
+                pUnknown = new IntPtr(result);
+
+                return MarshalGeneric<T>.FromAbi(pUnknown);
+            }
+            finally
+            {
+                // CoCreateInstance and FromAbi both AddRef on the native object.
+                // Release once to prevent memory leak.
+                if (pUnknown != IntPtr.Zero)
+                {
+                    Marshal.Release(pUnknown);
+                }
             }
         }
     }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs

@@ -36,6 +36,7 @@ internal sealed class ContextMenuHelper
             contextMenu.Add(new CommandContextItem(new KillProcessCommand(windowData))
             {
                 RequestedShortcut = KeyChordHelpers.FromModifiers(true, false, false, false, (int)VirtualKey.Delete, 0),
+                IsCritical = true,
             });
         }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/IVirtualDesktopManager.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 
@@ -11,18 +12,16 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 /// Interface for accessing Virtual Desktop Manager.
 /// Code used from <see href="https://learn.microsoft.com/archive/blogs/winsdk/virtual-desktop-switching-in-windows-10"./>
 /// </summary>
-[ComImport]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+[GeneratedComInterface]
 [Guid("a5cd92ff-29be-454c-8d04-d82879fb3f1b")]
-[System.Security.SuppressUnmanagedCodeSecurity]
-internal interface IVirtualDesktopManager
+public partial interface IVirtualDesktopManager
 {
     [PreserveSig]
-    int IsWindowOnCurrentVirtualDesktop([In] IntPtr hTopLevelWindow, [Out] out int onCurrentDesktop);
+    int IsWindowOnCurrentVirtualDesktop(IntPtr hTopLevelWindow, out int onCurrentDesktop);
 
     [PreserveSig]
-    int GetWindowDesktopId([In] IntPtr hTopLevelWindow, [Out] out Guid desktop);
+    int GetWindowDesktopId(IntPtr hTopLevelWindow, out Guid desktop);
 
     [PreserveSig]
-    int MoveWindowToDesktop([In] IntPtr hTopLevelWindow, [MarshalAs(UnmanagedType.LPStruct)][In] Guid desktop);
+    int MoveWindowToDesktop(IntPtr hTopLevelWindow, ref Guid desktop);
 }

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

@@ -13,7 +13,7 @@ using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessage
 namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 
 [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 static class NativeMethods
+public static partial class NativeMethods
 {
     [DllImport("user32.dll", CharSet = CharSet.Unicode)]
     public static extern int EnumWindows(EnumWindowsProc callPtr, IntPtr lParam);
@@ -99,31 +99,14 @@ public static class NativeMethods
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetFirmwareType(ref FirmwareType FirmwareType);
 
-    [DllImport("user32.dll")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool ExitWindowsEx(uint uFlags, uint dwReason);
-
-    [DllImport("user32")]
-    public static extern void LockWorkStation();
-
-    [DllImport("Powrprof.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static extern bool SetSuspendState(bool hibernate, bool forceCritical, bool disableWakeEvent);
-
-    [DllImport("Shell32.dll", CharSet = CharSet.Unicode)]
-    public static extern uint SHEmptyRecycleBin(IntPtr hWnd, uint dwFlags);
-
-    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
-    public static extern HRESULT SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, uint cchOutBuf, IntPtr ppvReserved);
-
-    [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("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-    public static extern int SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string path, IntPtr pbc, ref Guid riid, [MarshalAs(UnmanagedType.Interface)] out IShellItem shellItem);
-
-    [DllImport("rpcrt4.dll")]
-    public static extern int UuidCreateSequential(out GUIDDATA Uuid);
+    [LibraryImport("ole32.dll")]
+    [return: MarshalAs(UnmanagedType.U4)]
+    public static partial uint CoCreateInstance(
+        ref Guid rclsid,
+        IntPtr pUnkOuter,
+        uint dwClsContext,
+        ref Guid riid,
+        out IntPtr rReturnedComObject);
 }
 
 [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "These are the names used by win32.")]
@@ -161,19 +144,6 @@ public static class Win32Constants
     public const int RPC_S_UUID_LOCAL_ONLY = 0x720;
 }
 
-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");
-}
-
 public enum HRESULT : uint
 {
     /// <summary>
@@ -1124,26 +1094,6 @@ public enum ExtendedWindowStyles : uint
     WS_EX_NOACTIVATE = 0x8000000,
 }
 
-[ComImport]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-[Guid("43826d1e-e718-42ee-bc55-a1e261c37bfe")]
-public interface IShellItem
-{
-    void BindToHandler(
-        IntPtr pbc,
-        [MarshalAs(UnmanagedType.LPStruct)] Guid bhid,
-        [MarshalAs(UnmanagedType.LPStruct)] Guid riid,
-        out IntPtr 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>
 /// The following are ShellItem DisplayName types.
 /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/VirtualDesktopHelper.cs

@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Text;
 
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
@@ -48,6 +49,10 @@ public class VirtualDesktopHelper
     /// </summary>
     private readonly List<Guid> _availableDesktops = [];
 
+#pragma warning disable SA1306 // Field names should begin with lower-case letter
+    private readonly uint CLSCTXINPROCALL = 0x17;
+#pragma warning restore SA1306 // Field names should begin with lower-case letter
+
     /// <summary>
     /// Id of the current visible Desktop.
     /// </summary>
@@ -55,15 +60,27 @@ public class VirtualDesktopHelper
 
     private static readonly CompositeFormat VirtualDesktopHelperDesktop = System.Text.CompositeFormat.Parse(Properties.Resources.VirtualDesktopHelper_Desktop);
 
+    private Guid iVirtualDesktopManagerCLSID = new("aa509086-5ca9-4c25-8f95-589d3c07b48a");
+
+    private Guid iVirtualDesktopManagerIID = new("a5cd92ff-29be-454c-8d04-d82879fb3f1b");
+
     /// <summary>
     /// Initializes a new instance of the <see cref="VirtualDesktopHelper"/> class.
     /// </summary>
     /// <param name="desktopListUpdate">Setting to configure if the list of available desktops should update automatically or only when calling <see cref="UpdateDesktopList"/>. Per default this is set to manual update (false) to have less registry queries.</param>
     public VirtualDesktopHelper(bool desktopListUpdate = false)
     {
+        var cw = new StrategyBasedComWrappers();
+
         try
         {
-            _virtualDesktopManager = (IVirtualDesktopManager)new CVirtualDesktopManager();
+            var hr = NativeMethods.CoCreateInstance(ref this.iVirtualDesktopManagerCLSID, nint.Zero, CLSCTXINPROCALL, ref iVirtualDesktopManagerIID, out var virtualDesktopManagerPtr);
+            if (hr != 0)
+            {
+                throw new ArgumentException($"Failed to create IVirtualDesktopManager instance. HR: 0x{hr:X}");
+            }
+
+            _virtualDesktopManager = (IVirtualDesktopManager)cw.GetOrCreateObjectForComInstance(virtualDesktopManagerPtr, CreateObjectFlags.None);
         }
         catch (COMException ex)
         {
@@ -409,7 +426,7 @@ public class VirtualDesktopHelper
     /// <param name="hWindow">Handle of the top level window.</param>
     /// <param name="desktopId">Guid of the target desktop.</param>
     /// <returns><see langword="True"/> on success and <see langword="false"/> on failure.</returns>
-    public bool MoveWindowToDesktop(IntPtr hWindow, in Guid desktopId)
+    public bool MoveWindowToDesktop(IntPtr hWindow, ref Guid desktopId)
     {
         if (_virtualDesktopManager == null)
         {
@@ -417,7 +434,7 @@ public class VirtualDesktopHelper
             return false;
         }
 
-        var hr = _virtualDesktopManager.MoveWindowToDesktop(hWindow, desktopId);
+        var hr = _virtualDesktopManager.MoveWindowToDesktop(hWindow, ref desktopId);
         if (hr != (int)HRESULT.S_OK)
         {
             ExtensionHost.LogMessage(new LogMessage() { Message = "VirtualDesktopHelper.MoveWindowToDesktop() failed: An exception was thrown when moving the window ({hWindow}) to another desktop ({desktopId})." });
@@ -455,7 +472,7 @@ public class VirtualDesktopHelper
         }
 
         Guid newDesktop = _availableDesktops[windowDesktopNumber - 1];
-        return MoveWindowToDesktop(hWindow, newDesktop);
+        return MoveWindowToDesktop(hWindow, ref newDesktop);
     }
 
     /// <summary>
@@ -486,7 +503,7 @@ public class VirtualDesktopHelper
         }
 
         Guid newDesktop = _availableDesktops[windowDesktopNumber + 1];
-        return MoveWindowToDesktop(hWindow, newDesktop);
+        return MoveWindowToDesktop(hWindow, ref newDesktop);
     }
 
     /// <summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs

@@ -3,18 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Resources;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Properties;
-using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.UI;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Commands;
 
@@ -68,7 +62,23 @@ internal sealed partial class LaunchProfileAsAdminCommand : InvokableCommand
 
     private void Launch(string id, string profile)
     {
-        var appManager = new ApplicationActivationManager();
+        ComWrappers cw = new StrategyBasedComWrappers();
+
+        var hr = NativeHelpers.CoCreateInstance(ref NativeHelpers.ApplicationActivationManagerCLSID, IntPtr.Zero, NativeHelpers.CLSCTXINPROCALL, ref NativeHelpers.ApplicationActivationManagerIID, out var appManagerPtr);
+
+        if (hr != 0)
+        {
+            throw new ArgumentException($"Failed to create IApplicationActivationManager instance. HR: 0x{hr:X}");
+        }
+
+        var appManager = (IApplicationActivationManager)cw.GetOrCreateObjectForComInstance(
+            appManagerPtr, CreateObjectFlags.None);
+
+        if (appManager == null)
+        {
+            throw new ArgumentException("Failed to get IApplicationActivationManager interface");
+        }
+
         const ActivateOptions noFlags = ActivateOptions.None;
         var queryArguments = TerminalHelper.GetArguments(profile, _openNewTab, _openQuake);
         try

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs

@@ -3,18 +3,12 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Resources;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Properties;
-using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.UI;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Commands;
 
@@ -38,7 +32,22 @@ internal sealed partial class LaunchProfileCommand : InvokableCommand
 
     private void Launch(string id, string profile)
     {
-        var appManager = new ApplicationActivationManager();
+        ComWrappers cw = new StrategyBasedComWrappers();
+
+        var hr = NativeHelpers.CoCreateInstance(ref NativeHelpers.ApplicationActivationManagerCLSID, IntPtr.Zero, NativeHelpers.CLSCTXINPROCALL, ref NativeHelpers.ApplicationActivationManagerIID, out var appManagerPtr);
+        if (hr != 0)
+        {
+            throw new ArgumentException($"Failed to create IApplicationActivationManager instance. HR: 0x{hr:X}");
+        }
+
+        var appManager = (IApplicationActivationManager)cw.GetOrCreateObjectForComInstance(
+            appManagerPtr, CreateObjectFlags.None);
+
+        if (appManager == null)
+        {
+            throw new ArgumentException("Failed to get IApplicationActivationManager interface");
+        }
+
         const ActivateOptions noFlags = ActivateOptions.None;
         var queryArguments = TerminalHelper.GetArguments(profile, _openNewTab, _openQuake);
         try

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/ApplicationActivationManager.cs

@@ -1,24 +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.CompilerServices;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
-
-// 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.WindowsTerminal/Helpers/IApplicationActivationManager.cs

@@ -4,6 +4,7 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 
@@ -18,14 +19,13 @@ public enum ActivateOptions
 }
 
 // ApplicationActivationManager
-[ComImport]
+[GeneratedComInterface(StringMarshalling = StringMarshalling.Utf16)]
 [Guid("2e941141-7f97-4756-ba1d-9decde894a3d")]
-[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-public interface IApplicationActivationManager
+public partial interface IApplicationActivationManager
 {
-    IntPtr ActivateApplication([In] string appUserModelId, [In] string arguments, [In] ActivateOptions options, [Out] out uint processId);
+    void ActivateApplication(string appUserModelId, string arguments, ActivateOptions options, out uint processId);
 
-    IntPtr ActivateForFile([In] string appUserModelId, [In] IntPtr /*IShellItemArray* */ itemArray, [In] string verb, [Out] out uint processId);
+    void ActivateForFile(string appUserModelId, IntPtr /*IShellItemArray* */ itemArray, string verb, out uint processId);
 
-    IntPtr ActivateForProtocol([In] string appUserModelId, [In] IntPtr /* IShellItemArray* */itemArray, [Out] out uint processId);
+    void ActivateForProtocol(string appUserModelId, IntPtr /* IShellItemArray* */itemArray, out uint processId);
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/NativeHelpers.cs

@@ -0,0 +1,32 @@
+// 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.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public sealed partial class NativeHelpers
+{
+    public const uint CLSCTXINPROCALL = 0x17;
+
+    [LibraryImport("ole32.dll")]
+    public static partial uint CoCreateInstance(
+        ref Guid rclsid,
+        IntPtr pUnkOuter,
+        uint dwClsContext,
+        ref Guid riid,
+        out IntPtr rReturnedComObject);
+
+#pragma warning disable CA2211 // Non-constant fields should not be visible
+#pragma warning disable SA1401 // Fields should be private
+    public static Guid ApplicationActivationManagerCLSID = new Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C");
+    public static Guid ApplicationActivationManagerIID = new Guid("2e941141-7f97-4756-ba1d-9decde894a3d");
+#pragma warning restore SA1401 // Fields should be private
+#pragma warning restore CA2211 // Non-constant fields should not be visible
+}

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PathToRoot>..\..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250401001</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
     <CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
     <WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428</WindowsSdkBuildToolsNuget>
     <WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40</WebView2Nuget>

src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config

@@ -3,5 +3,5 @@
   <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>

src/modules/fancyzones/FancyZones.FuzzTests/FancyZones.FuzzTests.csproj

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+	<Import Project="..\..\..\Common.Dotnet.FuzzTest.props" />
+	
+	<PropertyGroup>
+		<OutputPath>..\..\..\..\$(Platform)\$(Configuration)\tests\FancyZones.FuzzTests\</OutputPath>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="..\editor\FancyZonesEditor\Utils\ParsingResult.cs" Link="ParsingResult.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Data\CustomLayouts.cs" Link="CustomLayouts.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Data\EditorData`1.cs" Link="EditorData`1.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Data\LayoutDefaultSettings.cs" Link="LayoutDefaultSettings.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Utils\DashCaseNamingPolicy.cs" Link="DashCaseNamingPolicy.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Utils\IOUtils.cs" Link="IOUtils.cs" />
+		<Compile Include="..\FancyZonesEditorCommon\Utils\StringUtils.cs" Link="StringUtils.cs" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="MSTest" />
+		<PackageReference Include="System.IO.Abstractions" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="OneFuzzConfig.json">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+	
+</Project>

src/modules/fancyzones/FancyZones.FuzzTests/FuzzTests.cs

@@ -0,0 +1,86 @@
+// 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.Text.Json;
+using FancyZonesEditorCommon.Data;
+using FancyZonesEditorCommon.Utils;
+using static FancyZonesEditorCommon.Data.CustomLayouts;
+
+namespace FancyZones.FuzzTests
+{
+    public class FuzzTests
+    {
+        public static void FuzzGridFromJsonElement(ReadOnlySpan<byte> input)
+        {
+            if (input.Length < 4)
+            {
+                return;
+            }
+
+            int inputData = BitConverter.ToInt32(input.Slice(0, 4));
+
+            // mock user input for custom-layouts.json
+            string mockCustomLayouts = $@"{{""custom-layouts"": [{{ 
+            ""uuid"": ""{{B8C275E-A7BC-485F-A35C-67B69164F51F}}"",
+                ""name"": ""Custom layout 1"",
+                ""type"": ""grid"",
+                ""info"": {{
+                    ""rows"": {inputData},
+                    ""columns"": {inputData},
+                    ""rows-percentage"": [ {inputData} ],
+                    ""columns-percentage"": [ {inputData}, {inputData}, {inputData} ],
+                    ""cell-child-map"": [ [{inputData}, {inputData}, {inputData}] ],
+                    ""show-spacing"": true,
+                    ""spacing"": {inputData},
+                    ""sensitivity-radius"": {inputData}
+                }}
+            }}]}}";
+
+            CustomLayoutListWrapper wrapper;
+            try
+            {
+                wrapper = JsonSerializer.Deserialize<CustomLayoutListWrapper>(mockCustomLayouts, JsonOptions);
+            }
+            catch (JsonException)
+            {
+                return;
+            }
+
+            List<CustomLayouts.CustomLayoutWrapper> customLayouts = wrapper.CustomLayouts;
+
+            if (customLayouts == null)
+            {
+                return;
+            }
+
+            // Get Layout Info from mockCustomLayouts
+            foreach (var zoneSet in customLayouts)
+            {
+                if (zoneSet.Uuid == null || zoneSet.Uuid.Length == 0)
+                {
+                    return;
+                }
+
+                CustomLayouts deserializer = new CustomLayouts();
+
+                // Fuzzing the deserializer
+                _ = deserializer.GridFromJsonElement(zoneSet.Info.GetRawText());
+            }
+        }
+
+        private static JsonSerializerOptions JsonOptions
+        {
+            get
+            {
+                return new JsonSerializerOptions
+                {
+                    PropertyNamingPolicy = new DashCaseNamingPolicy(),
+                    WriteIndented = true,
+                };
+            }
+        }
+    }
+}

src/modules/fancyzones/FancyZones.FuzzTests/MSTestSettings.cs

@@ -0,0 +1,5 @@
+// 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.
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]

src/modules/fancyzones/FancyZones.FuzzTests/OneFuzzConfig.json

@@ -0,0 +1,51 @@
+{
+  "configVersion": 3,
+  "entries": [
+    {
+      "fuzzer": {
+        "$type": "libfuzzerDotNet",
+        "dll": "FancyZones.FuzzTests.dll",
+        "class": "FancyZones.FuzzTests.FuzzTests",
+        "method": "FuzzGridFromJsonElement",
+        "FuzzingTargetBinaries": [
+          "PowerToys.FancyZones.dll"
+        ]
+      },
+      "adoTemplate": {
+        // supply the values appropriate to your
+        // project, where bugs will be filed 
+        "org": "microsoft",
+        "project": "OS",
+        "AssignedTo": "mengyuanchen@microsoft.com",
+        "AreaPath": "OS\\Windows Client and Services\\WinPD\\DEEP-Developer Experience, Ecosystem and Partnerships\\SHINE\\PowerToys",
+        "IterationPath": "OS\\Future"
+      },
+      "jobNotificationEmail": "mengyuanchen@microsoft.com",
+      "skip": false,
+      "rebootAfterSetup": false,
+      "oneFuzzJobs": [
+        // at least one job is required
+        {
+          "projectName": "FancyZones",
+          "targetName": "FancyZones-dotnet-fuzzer-FuzzGridFromJsonElement"
+        }
+      ],
+      "jobDependencies": [
+        // this should contain, at minimum,
+        // the DLL and PDB files
+        // you will need to add any other files required
+        // (globs are supported)
+        "FancyZones.FuzzTests.dll",
+        "FancyZones.FuzzTests.pdb",
+        "Microsoft.Windows.SDK.NET.dll",
+        "Newtonsoft.Json.dll",
+        "System.IO.Abstractions.dll",
+        "Testably.Abstractions.FileSystem.Interface.dll",
+        "TestableIO.System.IO.Abstractions.dll",
+        "TestableIO.System.IO.Abstractions.Wrappers.dll",
+        "WinRT.Runtime.dll"
+      ],
+      "SdlWorkItemId": 49911822
+    }
+  ]
+}

src/modules/peek/Peek.UI/Peek.UI.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <!-- Look at Directory.Build.props in root for common stuff as well -->
   <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
   <Import Project="..\..\..\Common.SelfContained.props" />

src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj

@@ -72,7 +72,6 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
-      <AdditionalDependencies>$(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -85,6 +84,9 @@
     <ProjectReference Include="..\lib\PowerRenameLib.vcxproj" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       <Project>{51920f1f-c28c-4adf-8660-4238766796c2}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\lib\PowerRenameLib.vcxproj" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      <Project>{51920f1f-c28c-4adf-8660-4238766796c2}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
     </ProjectReference>

src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\..\WinAppSdkCppPre.props" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -200,10 +202,12 @@
     <ResourceCompile Include="PowerRenameUI.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="..\..\..\WinAppSdkCppPost.props" />
   <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
     <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
     <Import Project="..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" />
   </ImportGroup>
@@ -211,8 +215,14 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.22621.2428\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.87.0\build\boost.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets'))" />
   </Target>

src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml

@@ -184,6 +184,7 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
                 <RowDefinition Height="48" />
+                <RowDefinition Height="48" />
             </Grid.RowDefinitions>
 
             <StackPanel
@@ -558,6 +559,33 @@
                         Content="&#xE8B1;"
                         FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                 </StackPanel>
+
+                <TextBlock
+                    x:Name="FileTimeLabel"
+                    x:Uid="TextBlock_FileTime"
+                    Margin="0,16,0,8"
+                    FontSize="12"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+
+                <StackPanel
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Spacing="4">
+                    <ComboBox
+                        x:Name="comboBox_fileTimeParts"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Width="200"
+                        HorizontalAlignment="Stretch"
+                        AutomationProperties.LabeledBy="{Binding ElementName=FileDateLabel}"
+                        SelectedIndex="0">
+                        <ComboBoxItem x:Uid="FileTimeParts_CreationTime" />
+                        <ComboBoxItem x:Uid="FileTimeParts_ModificationTime" />
+                        <ComboBoxItem x:Uid="FileTimeParts_AccessTime" />
+                    </ComboBox>
+                </StackPanel>
+
             </StackPanel>
 
             <Rectangle

src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.cpp

@@ -792,6 +792,32 @@ namespace winrt::PowerRenameUI::implementation
         button_settings().Click([&](auto const&, auto const&) {
             OpenSettingsApp();
         });
+
+        // ComboBox RenameParts
+        comboBox_fileTimeParts().SelectionChanged([&](auto const&, auto const&) {
+            int selectedIndex = comboBox_fileTimeParts().SelectedIndex();
+            if (selectedIndex == 0)
+            { 
+                // default behaviour. Date Created
+                UpdateFlag(CreationTime, UpdateFlagCommand::Set);
+                UpdateFlag(ModificationTime, UpdateFlagCommand::Reset);
+                UpdateFlag(AccessTime, UpdateFlagCommand::Reset);
+            }
+            else if (selectedIndex == 1)
+            {
+                // Date Modified
+                UpdateFlag(ModificationTime, UpdateFlagCommand::Set);
+                UpdateFlag(CreationTime, UpdateFlagCommand::Reset);
+                UpdateFlag(AccessTime, UpdateFlagCommand::Reset);
+            }
+            else if (selectedIndex == 2)
+            {
+                // Accessed
+                UpdateFlag(AccessTime, UpdateFlagCommand::Set);
+                UpdateFlag(CreationTime, UpdateFlagCommand::Reset);
+                UpdateFlag(ModificationTime, UpdateFlagCommand::Reset);
+            }
+        });
     }
 
     void MainWindow::ToggleItem(int32_t id, bool checked)

src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw

@@ -411,4 +411,16 @@
   <data name="ToggleButton_RandItems.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Random string features</value>
   </data>
+  <data name="TextBlock_FileTime.Text" xml:space="preserve">
+    <value>Time used for replacement</value>
+  </data>
+  <data name="FileTimeParts_CreationTime.Content" xml:space="preserve">
+    <value>Creation Time</value>
+  </data>
+  <data name="FileTimeParts_ModificationTime.Content" xml:space="preserve">
+    <value>Modification Time</value>
+  </data>
+  <data name="FileTimeParts_AccessTime.Content" xml:space="preserve">
+    <value>Access Time</value>
+  </data>
 </root>

src/modules/powerrename/PowerRenameUILib/packages.config

@@ -6,5 +6,5 @@
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.22621.2428" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250401001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
 </packages>

src/modules/powerrename/lib/PowerRenameInterfaces.h

@@ -18,7 +18,10 @@ enum PowerRenameFlags
     Lowercase = 0x400,
     Titlecase = 0x800,
     Capitalized = 0x1000,
-    RandomizeItems = 0x2000
+    RandomizeItems = 0x2000,
+    CreationTime = 0x4000,
+    ModificationTime = 0x8000,
+    AccessTime = 0x10000,
 };
 
 enum PowerRenameFilters
@@ -67,7 +70,7 @@ interface __declspec(uuid("C7F59201-4DE1-4855-A3A2-26FC3279C8A5")) IPowerRenameI
 public:
     IFACEMETHOD(PutPath)(_In_opt_ PCWSTR newPath) = 0;
     IFACEMETHOD(GetPath)(_Outptr_ PWSTR * path) = 0;
-    IFACEMETHOD(GetTime)(_Outptr_ SYSTEMTIME* time) = 0;
+    IFACEMETHOD(GetTime)(_In_ DWORD flags, _Outptr_ SYSTEMTIME * time) = 0;
     IFACEMETHOD(GetShellItem)(_Outptr_ IShellItem** ppsi) = 0;
     IFACEMETHOD(GetOriginalName)(_Outptr_ PWSTR * originalName) = 0;
     IFACEMETHOD(PutOriginalName)(_In_opt_ PCWSTR originalName) = 0;

src/modules/powerrename/lib/PowerRenameItem.cpp

@@ -56,12 +56,28 @@ IFACEMETHODIMP CPowerRenameItem::GetPath(_Outptr_ PWSTR* path)
     return hr;
 }
 
-IFACEMETHODIMP CPowerRenameItem::GetTime(_Outptr_ SYSTEMTIME* time)
+IFACEMETHODIMP CPowerRenameItem::GetTime(_In_ DWORD flags, _Outptr_ SYSTEMTIME* time)
 {
     CSRWSharedAutoLock lock(&m_lock);
     HRESULT hr = E_FAIL;
+    PowerRenameFlags parsedTimeType;
 
-    if (m_isTimeParsed)
+    // Get Time by PowerRenameFlags
+    if (flags & PowerRenameFlags::ModificationTime)
+    {
+        parsedTimeType = PowerRenameFlags::ModificationTime;
+    }
+    else if (flags & PowerRenameFlags::AccessTime)
+    {
+        parsedTimeType = PowerRenameFlags::AccessTime;
+    }
+    else
+    {
+        // Default to modification time if no specific flag is set
+        parsedTimeType = PowerRenameFlags::CreationTime;
+    }
+
+    if (m_isTimeParsed && parsedTimeType == m_parsedTimeType)
     {
         hr = S_OK;
     }
@@ -70,21 +86,43 @@ IFACEMETHODIMP CPowerRenameItem::GetTime(_Outptr_ SYSTEMTIME* time)
         HANDLE hFile = CreateFileW(m_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
         if (hFile != INVALID_HANDLE_VALUE)
         {
-            FILETIME CreationTime;
-            if (GetFileTime(hFile, &CreationTime, NULL, NULL))
+            FILETIME FileTime;
+            bool success = false;
+
+            // Get Time by PowerRenameFlags
+            switch (parsedTimeType)
+            {
+            case PowerRenameFlags::CreationTime:
+                success = GetFileTime(hFile, &FileTime, NULL, NULL);
+                break;
+            case PowerRenameFlags::ModificationTime:
+                success = GetFileTime(hFile, NULL, NULL, &FileTime);
+                break;
+            case PowerRenameFlags::AccessTime:
+                success = GetFileTime(hFile, NULL, &FileTime, NULL);
+                break;
+            default:
+                // Default to modification time if no specific flag is set
+                success = GetFileTime(hFile, NULL, NULL, &FileTime);
+                break;
+            }
+
+            if (success)
             {
                 SYSTEMTIME SystemTime, LocalTime;
-                if (FileTimeToSystemTime(&CreationTime, &SystemTime))
+                if (FileTimeToSystemTime(&FileTime, &SystemTime))
                 {
                     if (SystemTimeToTzSpecificLocalTime(NULL, &SystemTime, &LocalTime))
                     {
                         m_time = LocalTime;
                         m_isTimeParsed = true;
+                        m_parsedTimeType = parsedTimeType;
                         hr = S_OK;
                     }
                 }
             }
         }
+
         CloseHandle(hFile);
     }
     *time = m_time;

src/modules/powerrename/lib/PowerRenameItem.h

@@ -16,7 +16,7 @@ public:
     // IPowerRenameItem
     IFACEMETHODIMP PutPath(_In_opt_ PCWSTR newPath);
     IFACEMETHODIMP GetPath(_Outptr_ PWSTR* path);
-    IFACEMETHODIMP GetTime(_Outptr_ SYSTEMTIME* time);
+    IFACEMETHODIMP GetTime(_In_ DWORD flags, _Outptr_ SYSTEMTIME* time);
     IFACEMETHODIMP GetShellItem(_Outptr_ IShellItem** ppsi);
     IFACEMETHODIMP PutOriginalName(_In_opt_ PCWSTR originalName);
     IFACEMETHODIMP GetOriginalName(_Outptr_ PWSTR* originalName);
@@ -54,6 +54,7 @@ protected:
     bool                            m_selected = true;
     bool                            m_isFolder = false;
     bool                            m_isTimeParsed = false;
+    PowerRenameFlags                m_parsedTimeType = PowerRenameFlags::CreationTime;
     bool                            m_canRename = true;
     int                             m_id = -1;
     int                             m_iconIndex = -1;

src/modules/powerrename/lib/Renaming.cpp

@@ -78,7 +78,7 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
 
     if (useFileTime)
     {
-        winrt::check_hresult(spItem->GetTime(&fileTime));
+        winrt::check_hresult(spItem->GetTime(flags, &fileTime));
         winrt::check_hresult(spRenameRegEx->PutFileTime(fileTime));
     }
 

src/runner/Resources.resx

@@ -1,5 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
@@ -89,7 +148,7 @@
     <value>This setting has been disabled by your administrator.</value>
   </data>
   <data name="STARTUP_DISABLED_BY_USER" xml:space="preserve">
-    <value>This setting has been disabled manually via &lt;a href=&quot;https://ms_settings_startupapps&quot; target=&quot;_blank&quot;&gt;Startup Settings&lt;/a&gt;.</value>
+    <value>This setting has been disabled manually via &lt;a href="https://ms_settings_startupapps" target="_blank"&gt;Startup Settings&lt;/a&gt;.</value>
   </data>
   <data name="GITHUB_NEW_VERSION_AVAILABLE" xml:space="preserve">
     <value>An update to PowerToys is available.</value>
@@ -121,6 +180,9 @@
     <value>Exit</value>
     <comment>Exit as a verb, as in Exit the application</comment>
   </data>
+  <data name="SHOW_TRAY_ICON_MENU_TEXT" xml:space="preserve">
+    <value>Show icon</value>
+  </data>
   <data name="SUBMIT_BUG_TEXT" xml:space="preserve">
     <value>Report bug</value>
   </data>
@@ -134,4 +196,4 @@
   <data name="TRAY_ICON_ADMIN_TOOLTIP" xml:space="preserve">
     <value>Administrator</value>
   </data>
-</root>
+</root>

src/runner/auto_start_helper.cpp

@@ -5,12 +5,13 @@
 
 #include <comdef.h>
 #include <taskschd.h>
+#include <common/logger/logger.h>
 
 // Helper macros from wix.
-// TODO: use "s" and "..." parameters to report errors from these functions.
 #define ExitOnFailure(x, s, ...) \
     if (FAILED(x))               \
     {                            \
+        Logger::error(s, ##__VA_ARGS__); \
         goto LExit;              \
     }
 #define ExitWithLastError(x, s, ...)       \
@@ -21,6 +22,7 @@
         {                                  \
             x = E_FAIL;                    \
         }                                  \
+        Logger::error(s, ##__VA_ARGS__);   \
         goto LExit;                        \
     }
 #define ExitFunction() \
@@ -52,11 +54,11 @@ bool create_auto_start_task_for_this_user(bool runElevated)
     // Get the Domain/Username for the trigger.
     if (!GetEnvironmentVariable(L"USERNAME", username, USERNAME_LEN))
     {
-        ExitWithLastError(hr, "Getting username failed: %x", hr);
+        ExitWithLastError(hr, "Getting username failed: {:x}", hr);
     }
     if (!GetEnvironmentVariable(L"USERDOMAIN", username_domain, USERNAME_DOMAIN_LEN))
     {
-        ExitWithLastError(hr, "Getting the user's domain failed: %x", hr);
+        ExitWithLastError(hr, "Getting the user's domain failed: {:x}", hr);
     }
     wcscat_s(username_domain, L"\\");
     wcscat_s(username_domain, username);
@@ -76,11 +78,11 @@ bool create_auto_start_task_for_this_user(bool runElevated)
                           CLSCTX_INPROC_SERVER,
                           IID_ITaskService,
                           reinterpret_cast<void**>(&pService));
-    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
+    ExitOnFailure(hr, "Failed to create an instance of ITaskService: {:x}", hr);
 
     // Connect to the task service.
     hr = pService->Connect(_variant_t(), _variant_t(), _variant_t(), _variant_t());
-    ExitOnFailure(hr, "ITaskService::Connect failed: %x", hr);
+    ExitOnFailure(hr, "ITaskService::Connect failed: {:x}", hr);
 
     // ------------------------------------------------------
     // Get the PowerToys task folder. Creates it if it doesn't exist.
@@ -90,12 +92,12 @@ bool create_auto_start_task_for_this_user(bool runElevated)
         // Folder doesn't exist. Get the Root folder and create the PowerToys subfolder.
         ITaskFolder* pRootFolder = NULL;
         hr = pService->GetFolder(_bstr_t(L"\\"), &pRootFolder);
-        ExitOnFailure(hr, "Cannot get Root Folder pointer: %x", hr);
+        ExitOnFailure(hr, "Cannot get Root Folder pointer: {:x}", hr);
         hr = pRootFolder->CreateFolder(_bstr_t(L"\\PowerToys"), _variant_t(L""), &pTaskFolder);
         if (FAILED(hr))
         {
             pRootFolder->Release();
-            ExitOnFailure(hr, "Cannot create PowerToys task folder: %x", hr);
+            ExitOnFailure(hr, "Cannot create PowerToys task folder: {:x}", hr);
         }
     }
 
@@ -118,47 +120,47 @@ bool create_auto_start_task_for_this_user(bool runElevated)
 
     // Create the task builder object to create the task.
     hr = pService->NewTask(0, &pTask);
-    ExitOnFailure(hr, "Failed to create a task definition: %x", hr);
+    ExitOnFailure(hr, "Failed to create a task definition: {:x}", hr);
 
     // ------------------------------------------------------
     // Get the registration info for setting the identification.
     hr = pTask->get_RegistrationInfo(&pRegInfo);
-    ExitOnFailure(hr, "Cannot get identification pointer: %x", hr);
+    ExitOnFailure(hr, "Cannot get identification pointer: {:x}", hr);
     hr = pRegInfo->put_Author(_bstr_t(username_domain));
-    ExitOnFailure(hr, "Cannot put identification info: %x", hr);
+    ExitOnFailure(hr, "Cannot put identification info: {:x}", hr);
 
     // ------------------------------------------------------
     // Create the settings for the task
     hr = pTask->get_Settings(&pSettings);
-    ExitOnFailure(hr, "Cannot get settings pointer: %x", hr);
+    ExitOnFailure(hr, "Cannot get settings pointer: {:x}", hr);
 
     hr = pSettings->put_StartWhenAvailable(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_StartWhenAvailable setting info: %x", hr);
+    ExitOnFailure(hr, "Cannot put_StartWhenAvailable setting info: {:x}", hr);
     hr = pSettings->put_StopIfGoingOnBatteries(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_StopIfGoingOnBatteries setting info: %x", hr);
+    ExitOnFailure(hr, "Cannot put_StopIfGoingOnBatteries setting info: {:x}", hr);
     hr = pSettings->put_ExecutionTimeLimit(_bstr_t(L"PT0S")); //Unlimited
-    ExitOnFailure(hr, "Cannot put_ExecutionTimeLimit setting info: %x", hr);
+    ExitOnFailure(hr, "Cannot put_ExecutionTimeLimit setting info: {:x}", hr);
     hr = pSettings->put_DisallowStartIfOnBatteries(VARIANT_FALSE);
-    ExitOnFailure(hr, "Cannot put_DisallowStartIfOnBatteries setting info: %x", hr);
+    ExitOnFailure(hr, "Cannot put_DisallowStartIfOnBatteries setting info: {:x}", hr);
     hr = pSettings->put_Priority(4);
-    ExitOnFailure(hr, "Cannot put_Priority setting info : %x", hr);
+    ExitOnFailure(hr, "Cannot put_Priority setting info : {:x}", hr);
 
     // ------------------------------------------------------
     // Get the trigger collection to insert the logon trigger.
     hr = pTask->get_Triggers(&pTriggerCollection);
-    ExitOnFailure(hr, "Cannot get trigger collection: %x", hr);
+    ExitOnFailure(hr, "Cannot get trigger collection: {:x}", hr);
 
     // Add the logon trigger to the task.
     {
         ITrigger* pTrigger = NULL;
         ILogonTrigger* pLogonTrigger = NULL;
         hr = pTriggerCollection->Create(TASK_TRIGGER_LOGON, &pTrigger);
-        ExitOnFailure(hr, "Cannot create the trigger: %x", hr);
+        ExitOnFailure(hr, "Cannot create the trigger: {:x}", hr);
 
         hr = pTrigger->QueryInterface(
             IID_ILogonTrigger, reinterpret_cast<void**>(&pLogonTrigger));
         pTrigger->Release();
-        ExitOnFailure(hr, "QueryInterface call failed for ILogonTrigger: %x", hr);
+        ExitOnFailure(hr, "QueryInterface call failed for ILogonTrigger: {:x}", hr);
 
         hr = pLogonTrigger->put_Id(_bstr_t(L"Trigger1"));
 
@@ -170,7 +172,7 @@ bool create_auto_start_task_for_this_user(bool runElevated)
         // The specified user must be a user on this computer.
         hr = pLogonTrigger->put_UserId(_bstr_t(username_domain));
         pLogonTrigger->Release();
-        ExitOnFailure(hr, "Cannot add user ID to logon trigger: %x", hr);
+        ExitOnFailure(hr, "Cannot add user ID to logon trigger: {:x}", hr);
     }
 
     // ------------------------------------------------------
@@ -182,23 +184,23 @@ bool create_auto_start_task_for_this_user(bool runElevated)
 
         // Get the task action collection pointer.
         hr = pTask->get_Actions(&pActionCollection);
-        ExitOnFailure(hr, "Cannot get Task collection pointer: %x", hr);
+        ExitOnFailure(hr, "Cannot get Task collection pointer: {:x}", hr);
 
         // Create the action, specifying that it is an executable action.
         hr = pActionCollection->Create(TASK_ACTION_EXEC, &pAction);
         pActionCollection->Release();
-        ExitOnFailure(hr, "Cannot create the action: %x", hr);
+        ExitOnFailure(hr, "Cannot create the action: {:x}", hr);
 
         // QI for the executable task pointer.
         hr = pAction->QueryInterface(
             IID_IExecAction, reinterpret_cast<void**>(&pExecAction));
         pAction->Release();
-        ExitOnFailure(hr, "QueryInterface call failed for IExecAction: %x", hr);
+        ExitOnFailure(hr, "QueryInterface call failed for IExecAction: {:x}", hr);
 
         // Set the path of the executable to PowerToys (passed as CustomActionData).
         hr = pExecAction->put_Path(_bstr_t(wszExecutablePath));
         pExecAction->Release();
-        ExitOnFailure(hr, "Cannot set path of executable: %x", hr);
+        ExitOnFailure(hr, "Cannot set path of executable: {:x}", hr);
     }
 
     // ------------------------------------------------------
@@ -206,7 +208,7 @@ bool create_auto_start_task_for_this_user(bool runElevated)
     {
         IPrincipal* pPrincipal = NULL;
         hr = pTask->get_Principal(&pPrincipal);
-        ExitOnFailure(hr, "Cannot get principal pointer: %x", hr);
+        ExitOnFailure(hr, "Cannot get principal pointer: {:x}", hr);
 
         // Set up principal information:
         hr = pPrincipal->put_Id(_bstr_t(L"Principal1"));
@@ -224,7 +226,7 @@ bool create_auto_start_task_for_this_user(bool runElevated)
             hr = pPrincipal->put_RunLevel(_TASK_RUNLEVEL::TASK_RUNLEVEL_LUA);
         }
         pPrincipal->Release();
-        ExitOnFailure(hr, "Cannot put principal run level: %x", hr);
+        ExitOnFailure(hr, "Cannot put principal run level: {:x}", hr);
     }
     // ------------------------------------------------------
     //  Save the task in the PowerToys folder.
@@ -239,7 +241,7 @@ bool create_auto_start_task_for_this_user(bool runElevated)
             TASK_LOGON_INTERACTIVE_TOKEN,
             SDDL_FULL_ACCESS_FOR_EVERYONE,
             &pRegisteredTask);
-        ExitOnFailure(hr, "Error saving the Task : %x", hr);
+        ExitOnFailure(hr, "Error saving the Task : {:x}", hr);
     }
 
 LExit:
@@ -275,7 +277,7 @@ bool delete_auto_start_task_for_this_user()
     // Get the Username for the task.
     if (!GetEnvironmentVariable(L"USERNAME", username, USERNAME_LEN))
     {
-        ExitWithLastError(hr, "Getting username failed: %x", hr);
+        ExitWithLastError(hr, "Getting username failed: {:x}", hr);
     }
 
     // Task Name.
@@ -289,11 +291,11 @@ bool delete_auto_start_task_for_this_user()
                           CLSCTX_INPROC_SERVER,
                           IID_ITaskService,
                           reinterpret_cast<void**>(&pService));
-    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
+    ExitOnFailure(hr, "Failed to create an instance of ITaskService: {:x}", hr);
 
     // Connect to the task service.
     hr = pService->Connect(_variant_t(), _variant_t(), _variant_t(), _variant_t());
-    ExitOnFailure(hr, "ITaskService::Connect failed: %x", hr);
+    ExitOnFailure(hr, "ITaskService::Connect failed: {:x}", hr);
 
     // ------------------------------------------------------
     // Get the PowerToys task folder.
@@ -340,7 +342,7 @@ bool is_auto_start_task_active_for_this_user()
     // Get the Username for the task.
     if (!GetEnvironmentVariable(L"USERNAME", username, USERNAME_LEN))
     {
-        ExitWithLastError(hr, "Getting username failed: %x", hr);
+        ExitWithLastError(hr, "Getting username failed: {:x}", hr);
     }
 
     // Task Name.
@@ -354,16 +356,16 @@ bool is_auto_start_task_active_for_this_user()
                           CLSCTX_INPROC_SERVER,
                           IID_ITaskService,
                           reinterpret_cast<void**>(&pService));
-    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
+    ExitOnFailure(hr, "Failed to create an instance of ITaskService: {:x}", hr);
 
     // Connect to the task service.
     hr = pService->Connect(_variant_t(), _variant_t(), _variant_t(), _variant_t());
-    ExitOnFailure(hr, "ITaskService::Connect failed: %x", hr);
+    ExitOnFailure(hr, "ITaskService::Connect failed: {:x}", hr);
 
     // ------------------------------------------------------
     // Get the PowerToys task folder.
     hr = pService->GetFolder(_bstr_t(L"\\PowerToys"), &pTaskFolder);
-    ExitOnFailure(hr, "ITaskFolder doesn't exist: %x", hr);
+    ExitOnFailure(hr, "ITaskFolder doesn't exist: {:x}", hr);
 
     // ------------------------------------------------------
     // If the task exists, disable.

src/runner/general_settings.cpp

@@ -1,6 +1,7 @@
 #include "pch.h"
 #include "general_settings.h"
 #include "auto_start_helper.h"
+#include "tray_icon.h"
 #include "Generated files/resource.h"
 
 #include <common/SettingsAPI/settings_helpers.h>
@@ -14,6 +15,7 @@
 
 // TODO: would be nice to get rid of these globals, since they're basically cached json settings
 static std::wstring settings_theme = L"system";
+static bool show_tray_icon = true;
 static bool run_as_elevated = false;
 static bool show_new_updates_toast_notification = true;
 static bool download_updates_automatically = true;
@@ -38,6 +40,7 @@ json::JsonObject GeneralSettings::to_json()
     }
     result.SetNamedValue(L"enabled", std::move(enabled));
 
+    result.SetNamedValue(L"show_tray_icon", json::value(showSystemTrayIcon));
     result.SetNamedValue(L"is_elevated", json::value(isElevated));
     result.SetNamedValue(L"run_elevated", json::value(isRunElevated));
     result.SetNamedValue(L"show_new_updates_toast_notification", json::value(showNewUpdatesToastNotification));
@@ -74,7 +77,9 @@ json::JsonObject load_general_settings()
 GeneralSettings get_general_settings()
 {
     const bool is_user_admin = check_user_is_admin();
-    GeneralSettings settings{
+    GeneralSettings settings
+    {
+        .showSystemTrayIcon = show_tray_icon,
         .isElevated = is_process_elevated(),
         .isRunElevated = run_as_elevated,
         .isAdmin = is_user_admin,
@@ -214,6 +219,13 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
         settings_theme = general_configs.GetNamedString(L"theme");
     }
 
+    if (json::has(general_configs, L"show_tray_icon", json::JsonValueType::Boolean))
+    {
+        show_tray_icon = general_configs.GetNamedBoolean(L"show_tray_icon");
+        // Update tray icon visibility when setting is toggled
+        set_tray_icon_visible(show_tray_icon);
+    }
+
     if (save)
     {
         GeneralSettings save_settings = get_general_settings();

src/runner/general_settings.h

@@ -5,6 +5,7 @@
 struct GeneralSettings
 {
     bool isStartupEnabled;
+    bool showSystemTrayIcon;
     std::wstring startupDisabledReason;
     std::map<std::wstring, bool> isModulesEnabledMap;
     bool isElevated;

src/runner/main.cpp

@@ -90,6 +90,7 @@ void open_menu_from_another_instance(std::optional<std::string> settings_window)
         msg = static_cast<LPARAM>(ESettingsWindowNames_from_string(settings_window.value()));
     }
     PostMessageW(hwnd_main, WM_COMMAND, ID_SETTINGS_MENU_COMMAND, msg);
+    SetForegroundWindow(hwnd_main); // Bring the settings window to the front
 }
 
 int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow, bool openOobe, bool openScoobe, bool showRestartNotificationAfterUpdate)
@@ -104,6 +105,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
 #endif
     Trace::RegisterProvider();
     start_tray_icon(isProcessElevated);
+    set_tray_icon_visible(get_general_settings().showSystemTrayIcon);
     CentralizedKeyboardHook::Start();
 
     int result = -1;

src/runner/resource.base.h

@@ -20,4 +20,5 @@
 #define ID_ABOUT_MENU_COMMAND 40003
 #define ID_REPORT_BUG_COMMAND 40004
 #define ID_DOCUMENTATION_MENU_COMMAND 40005
-#define ID_QUICK_ACCESS_MENU_COMMAND 40006
+#define ID_QUICK_ACCESS_MENU_COMMAND 40006
+#define ID_SHOW_TRAY_ICON_MENU_COMMAND 40007

src/runner/tray_icon.cpp

@@ -2,6 +2,7 @@
 #include "Generated files/resource.h"
 #include "settings_window.h"
 #include "tray_icon.h"
+#include "general_settings.h"
 #include "centralized_hotkeys.h"
 #include "centralized_kb_hook.h"
 #include <Windows.h>
@@ -90,6 +91,13 @@ void handle_tray_command(HWND window, const WPARAM command_id, LPARAM lparam)
         }
         DestroyWindow(window);
         break;
+    case ID_SHOW_TRAY_ICON_MENU_COMMAND:
+    {
+        GeneralSettings settings = get_general_settings();
+        settings.showSystemTrayIcon = true;
+        apply_general_settings(settings.to_json(), true);
+        break;
+    }
     case ID_ABOUT_MENU_COMMAND:
         if (!about_box_shown)
         {
@@ -191,11 +199,13 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
                 {
                     static std::wstring settings_menuitem_label = GET_RESOURCE_STRING(IDS_SETTINGS_MENU_TEXT);
                     static std::wstring exit_menuitem_label = GET_RESOURCE_STRING(IDS_EXIT_MENU_TEXT);
+                    static std::wstring show_tray_icon_menuitem_label = GET_RESOURCE_STRING(IDS_SHOW_TRAY_ICON_MENU_TEXT);
                     static std::wstring submit_bug_menuitem_label = GET_RESOURCE_STRING(IDS_SUBMIT_BUG_TEXT);
                     static std::wstring documentation_menuitem_label = GET_RESOURCE_STRING(IDS_DOCUMENTATION_MENU_TEXT);
                     static std::wstring quick_access_menuitem_label = GET_RESOURCE_STRING(IDS_QUICK_ACCESS_MENU_TEXT);
                     change_menu_item_text(ID_SETTINGS_MENU_COMMAND, settings_menuitem_label.data());
                     change_menu_item_text(ID_EXIT_MENU_COMMAND, exit_menuitem_label.data());
+                    change_menu_item_text(ID_SHOW_TRAY_ICON_MENU_COMMAND, show_tray_icon_menuitem_label.data());
                     change_menu_item_text(ID_REPORT_BUG_COMMAND, submit_bug_menuitem_label.data());
                     change_menu_item_text(ID_DOCUMENTATION_MENU_COMMAND, documentation_menuitem_label.data());
                     change_menu_item_text(ID_QUICK_ACCESS_MENU_COMMAND, quick_access_menuitem_label.data());
@@ -312,6 +322,14 @@ void start_tray_icon(bool isProcessElevated)
     }
 }
 
+void set_tray_icon_visible(bool shouldIconBeVisible)
+{
+    tray_icon_data.uFlags |= NIF_STATE;
+    tray_icon_data.dwStateMask = NIS_HIDDEN;
+    tray_icon_data.dwState = shouldIconBeVisible ? 0 : NIS_HIDDEN;
+    Shell_NotifyIcon(NIM_MODIFY, &tray_icon_data);
+}
+
 void stop_tray_icon()
 {
     if (tray_icon_created)