[PT Run] Replace tblimp-Microsoft.Search.Interop package with source implementation (#16363)

* Removed Search Interop tlb package. Added minimal Search API Com implementation * Added CSearchManagerImp * Updated Main with proper reference to CSearchManagerImp. Switched WindowsIndexerTest to use Indexer.Interop classes * Updated with proper SearchAPI Interop implementation * Deleted initial CSearchManager file that didn't work * Updated namespaces to match folder structure * Removed the interfaces and classes not being used from SearchAPI. Added suppressions * Updated spell check. Renamed CSearch call back to original * Fix spell check * Switched back to original class name for Search Manager in tests * Removed Microsoft.Search.Interop.dll from setup * Removed Microsoft.Search.Interop package from PowerLauncher and signing scripts
2025-06-07 17:42:45 +08:00 · 2022-02-16 11:06:10 -05:00 · 2022-02-16 11:06:10 -05:00 · 35bfb0f83e
commit 35bfb0f83e
parent 832f580aa8
18 changed files with 773 additions and 16 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@ -264,6 +264,7 @@ Cls
 cls
 CLSCTX
 clsid
+Clusion
 cmder
 Cmdlet
 cmdline
@ -1503,6 +1504,7 @@ pesi
 PEXCEPTION
 pfn
 pfo
+pft
 pgp
 pguid
 phbm
@ -2234,6 +2236,7 @@ vsonline
 vstemplate
 VSTHRD
 VSTT
+vtable
 VTABLE
 Vtbl
 WBounds
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@ -158,7 +158,6 @@
        },
        {
            "MatchedPath": [
-                "Microsoft.Search.Interop.dll",
                "ModernWpf.dll",
                "ModernWpf.Controls.dll", 
                "System.IO.Abstractions.dll", 
--- a/.pipelines/versionAndSignCheck.ps1
+++ b/.pipelines/versionAndSignCheck.ps1
@ -27,14 +27,11 @@ if($items.Count -eq 0)

 $items | ForEach-Object { 
    if($_.VersionInfo.FileVersion -eq "1.0.0.0" )
-	{
-		if(-not $_.Name.EndsWith("Microsoft.Search.Interop.dll"))
 	{
 		Write-Host "Version not set: " + $_.FullName
 		$totalFailure++;
 	}
 }
-}

 $items | ForEach-Object { 
 	$auth = Get-AuthenticodeSignature $_.FullName
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@ -1349,7 +1349,7 @@

            <Component Id="launcherInstallComponent" Directory="LauncherInstallFolder" Guid="5E688DB4-C522-4268-BA54-ED1CDFFE9DB6">
                <File Source="$(var.BinX64Dir)modules\Launcher\PowerToys.Launcher.dll" />
-                <?foreach File in concrt140_app.dll;e_sqlite3.dll;JetBrains.Annotations.dll;Mages.Core.dll;Microsoft.Search.Interop.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;NLog.dll;NLog.Extensions.Logging.dll;PowerToys.PowerLauncher.deps.json;PowerToys.PowerLauncher.dll;PowerToys.PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;PowerToys.PowerLauncher.runtimeconfig.json;System.Data.OleDb.dll;UnitsNet.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToys.Interop.dll;PowerToys.ManagedTelemetry.dll;PowerToys.PowerLauncher.Telemetry.dll;Microsoft.Data.Sqlite.dll;SQLitePCLRaw.batteries_v2.dll;SQLitePCLRaw.core.dll;SQLitePCLRaw.provider.e_sqlite3.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;ControlzEx.dll;PowerToys.ManagedCommon.dll;System.IO.Abstractions.dll;PowerToys.Common.UI.dll;System.ServiceProcess.ServiceController.dll;Microsoft.Toolkit.Uwp.Notifications.dll;ModernWpf.Controls.dll;ModernWpf.dll;WinRT.Runtime.dll;Microsoft.Windows.SDK.NET.dll?>
+                <?foreach File in concrt140_app.dll;e_sqlite3.dll;JetBrains.Annotations.dll;Mages.Core.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;NLog.dll;NLog.Extensions.Logging.dll;PowerToys.PowerLauncher.deps.json;PowerToys.PowerLauncher.dll;PowerToys.PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;PowerToys.PowerLauncher.runtimeconfig.json;System.Data.OleDb.dll;UnitsNet.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToys.Interop.dll;PowerToys.ManagedTelemetry.dll;PowerToys.PowerLauncher.Telemetry.dll;Microsoft.Data.Sqlite.dll;SQLitePCLRaw.batteries_v2.dll;SQLitePCLRaw.core.dll;SQLitePCLRaw.provider.e_sqlite3.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;ControlzEx.dll;PowerToys.ManagedCommon.dll;System.IO.Abstractions.dll;PowerToys.Common.UI.dll;System.ServiceProcess.ServiceController.dll;Microsoft.Toolkit.Uwp.Notifications.dll;ModernWpf.Controls.dll;ModernWpf.dll;WinRT.Runtime.dll;Microsoft.Windows.SDK.NET.dll?>
                <File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\$(var.File)" />
                <?endforeach?>
                <File Source="$(var.BinX64Dir)Settings\PowerToys.Settings.UI.Lib.dll" />
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchCatalogManager.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchCatalogManager.cs
@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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")]
+    public interface CSearchCatalogManager : ISearchCatalogManager
+    {
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchCatalogManagerClass.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchCatalogManagerClass.cs
@ -0,0 +1,133 @@
+// 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.Plugin.Indexer.Interop
+{
+    [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)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1055:URI-like return values should not be strings", Justification = "Keeping original method name")]
+        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();
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchManager.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchManager.cs
@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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")]
+    public interface CSearchManager : ISearchManager
+    {
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchManagerClass.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchManagerClass.cs
@ -0,0 +1,91 @@
+// 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.Plugin.Indexer.Interop
+{
+    [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;
+        }
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchQueryHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchQueryHelper.cs
@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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")]
+    public interface CSearchQueryHelper : ISearchQueryHelper
+    {
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchQueryHelperClass.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/CSearchQueryHelperClass.cs
@ -0,0 +1,134 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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;
+        }
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchCatalogManager.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchCatalogManager.cs
@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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
+    {
+        [DispId(1610678272)]
+        string Name
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [return: MarshalAs(UnmanagedType.LPWStr)]
+            get;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void GetCatalogStatus(out object pStatus, out object pPausedReason);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void Reset();
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void Reindex();
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void ReindexMatchingURLs([MarshalAs(UnmanagedType.LPWStr), In] string pszPattern);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void ReindexSearchRoot([MarshalAs(UnmanagedType.LPWStr), In] string pszRoot);
+
+        [DispId(1610678280)]
+        uint ConnectTimeout
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678282)]
+        uint DataTimeout
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        int NumberOfItems();
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void NumberOfItemsToIndex(
+          out int plIncrementalCount,
+          out int plNotificationQueue,
+          out int plHighPriorityQueue);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Design", "CA1055:URI-like return values should not be strings", Justification = "Keeping original method name")]
+        string URLBeingIndexed();
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        uint GetURLIndexingState([MarshalAs(UnmanagedType.LPWStr), In] string psz);
+
+        [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);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void GetItemsChangedSink(
+          [MarshalAs(UnmanagedType.Interface), In] object pISearchNotifyInlineSite,
+          [In] ref Guid riid,
+          out IntPtr ppv,
+          out Guid pGUIDCatalogResetSignature,
+          out Guid pGUIDCheckPointSignature,
+          out uint pdwLastCheckPointNumber);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void UnregisterViewForNotification([In] uint dwCookie);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void SetExtensionClusion([MarshalAs(UnmanagedType.LPWStr), In] string pszExtension, [In] int fExclude);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object EnumerateExcludedExtensions();
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.Interface)]
+        CSearchQueryHelper GetQueryHelper();
+
+        [DispId(1610678295)]
+        int DiacriticSensitivity
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetCrawlScopeManager();
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchManager.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchManager.cs
@ -0,0 +1,90 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [ComConversionLoss]
+    [Guid("AB310581-AC80-11D1-8DF3-00C04FB6EF69")]
+    [InterfaceType(1)]
+    [ComImport]
+    public interface ISearchManager
+    {
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void GetIndexerVersionStr([MarshalAs(UnmanagedType.LPWStr)] out string ppszVersionString);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void GetIndexerVersion(out uint pdwMajor, out uint pdwMinor);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        IntPtr GetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        void SetParameter([MarshalAs(UnmanagedType.LPWStr), In] string pszName, [In] ref object pValue);
+
+        [DispId(1610678276)]
+        string ProxyName
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [return: MarshalAs(UnmanagedType.LPWStr)]
+            get;
+        }
+
+        [DispId(1610678277)]
+        string BypassList
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [return: MarshalAs(UnmanagedType.LPWStr)]
+            get;
+        }
+
+        [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);
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.Interface)]
+        CSearchCatalogManager GetCatalog([MarshalAs(UnmanagedType.LPWStr), In] 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;
+        }
+
+        [DispId(1610678282)]
+        object UseProxy
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678283)]
+        int LocalBypass
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678284)]
+        uint PortNumber
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchQueryHelper.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Interop/ISearchQueryHelper.cs
@ -0,0 +1,134 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.Plugin.Indexer.Interop
+{
+    [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
+    {
+        [DispId(1610678272)]
+        string ConnectionString
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [return: MarshalAs(UnmanagedType.LPWStr)]
+            get;
+        }
+
+        [DispId(1610678273)]
+        uint QueryContentLocale
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678275)]
+        uint QueryKeywordLocale
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678277)]
+        object QueryTermExpansion
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [DispId(1610678279)]
+        object QuerySyntax
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+
+        [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;
+        }
+
+        [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;
+        }
+
+        [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;
+        }
+
+        [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;
+        }
+
+        [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        string GenerateSQLFromUserQuery([MarshalAs(UnmanagedType.LPWStr), In] 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);
+
+        [DispId(1610678291)]
+        int QueryMaxResults
+        {
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            [param: In]
+            set;
+            [MethodImpl(MethodImplOptions.InternalCall, MethodCodeType = MethodCodeType.Runtime)]
+            get;
+        }
+    }
+}
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
@ -11,9 +11,9 @@ using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using ManagedCommon;
 using Microsoft.Plugin.Indexer.DriveDetection;
+using Microsoft.Plugin.Indexer.Interop;
 using Microsoft.Plugin.Indexer.SearchHelper;
 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.Search.Interop;
 using Wox.Infrastructure;
 using Wox.Infrastructure.Storage;
 using Wox.Plugin;
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
@ -47,9 +47,6 @@
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
    <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
-    <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0">
-      <NoWarn>NU1701</NoWarn>
-    </PackageReference>
  </ItemGroup>

  <ItemGroup>
--- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs
+++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs
@ -5,7 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Microsoft.Search.Interop;
+using Microsoft.Plugin.Indexer.Interop;
 using Wox.Plugin.Logger;

 namespace Microsoft.Plugin.Indexer.SearchHelper
--- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
+++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj
@ -107,9 +107,6 @@
    <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
    <PackageReference Include="System.Data.OleDb" Version="6.0.0" />
    <PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
-    <PackageReference Include="tlbimp-Microsoft.Search.Interop" Version="1.0.0">
-      <NoWarn>NU1701</NoWarn>
-    </PackageReference>
    <PackageReference Include="UnitsNet" Version="4.76.0" />
  </ItemGroup>

--- a/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs
+++ b/src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs
@ -7,8 +7,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Plugin.Indexer;
 using Microsoft.Plugin.Indexer.DriveDetection;
+using Microsoft.Plugin.Indexer.Interop;
 using Microsoft.Plugin.Indexer.SearchHelper;
-using Microsoft.Search.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Wox.Plugin;