From 5ca1b7001be1629d6b5ac1e24622afd0b6f7e005 Mon Sep 17 00:00:00 2001
From: HetCreep <239326951+HetCreep@users.noreply.github.com>
Date: Fri, 9 Oct 2026 02:59:54 +0700
Subject: [PATCH] fix: remove the DisableSearchHistory and
 DisableSearchHighlights switches (#800)

---
 Regfiles/Disable_Search_Highlights.reg        | Bin 488 -> 0 bytes
 Regfiles/Disable_Search_History.reg           | Bin 408 -> 0 bytes
 .../Sysprep/Disable_Search_Highlights.reg     | Bin 490 -> 0 bytes
 Regfiles/Sysprep/Disable_Search_History.reg   | Bin 410 -> 0 bytes
 Regfiles/Undo/Enable_Search_Highlights.reg    | Bin 492 -> 0 bytes
 Regfiles/Undo/Enable_Search_History.reg       | Bin 408 -> 0 bytes
 Scripts/Get.ps1                               |   2 --
 Tests/FeatureParameterContracts.Tests.ps1     |  24 ++++++++++++++++++
 Win11Debloat.ps1                              |   2 --
 9 files changed, 24 insertions(+), 4 deletions(-)
 delete mode 100644 Regfiles/Disable_Search_Highlights.reg
 delete mode 100644 Regfiles/Disable_Search_History.reg
 delete mode 100644 Regfiles/Sysprep/Disable_Search_Highlights.reg
 delete mode 100644 Regfiles/Sysprep/Disable_Search_History.reg
 delete mode 100644 Regfiles/Undo/Enable_Search_Highlights.reg
 delete mode 100644 Regfiles/Undo/Enable_Search_History.reg

diff --git a/Regfiles/Disable_Search_Highlights.reg b/Regfiles/Disable_Search_Highlights.reg
deleted file mode 100644
index 83f8d476482670375a98b673e98d859044777e09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmZ9JK}*9x5QX1a@INd)>BV~SqIl5;6wyPqiWrf!O=F-ou!+R}dG(tiK~t99+4p8=
z=FRNS_mfI(v{a>5wSuO~RlwD16t#s(@Rpzo9Q24k;w`}&@QIFe%-YwU?=!fG$7h;r
z&Fi3h&Wxyq-a%J*3vTPqHeUCDDqAvU`hZ_(Omqa9wwxW{tYQPQGw{ml@9M7ywdTZp
z>ClzEQ2B;#p7o|n&FFLry3+%AhQ<V(Vk@o4-@4))=GOH@_`36@J5^KieWEsY+J-Z-
zoPYh>y<wU9f{d@OZKP}NlfeZ3M_qUy2{HXtmm2AuxwLp9_SApDexhIfkC^=h1iMws

diff --git a/Regfiles/Disable_Search_History.reg b/Regfiles/Disable_Search_History.reg
deleted file mode 100644
index 18158931870367fcdd058380809cce4ae26f946b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcmZ9I(MrQW5Jk^(!G8$-0P)2arBAj{k@^s=B1WXPX&aCPlD45guby2Ek}@nicV_3#
z-TVFZOhL(tik60il$?#Vh8;CWD-*kgs1heU*{|&u;!=FcITywmgLtm3jpO`+4?caJ
zaJr+hx{zhb*6#LiTi`!Nj#sAKx%Y*4ZkVen72WeFp7UUyl6hCG)zwC>+{#R*r7V^D
zetX%;?o7VDFKQK(&h~#3IRBM}d}joIHZs0NZ9{I&$Mz0!Ti%<Q_Wm+)vU6d@kdaQd
RDyzM(qHDpqE;<Lp{R0Q4N8kVe

diff --git a/Regfiles/Sysprep/Disable_Search_Highlights.reg b/Regfiles/Sysprep/Disable_Search_Highlights.reg
deleted file mode 100644
index 90c5351b137c3e359bbd86d50e73d3c110b42b05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 490
zcmZ9JK~KXl429nriT@Do1Q*7I3y2GB(l~Gd2@VvYZtF_LSfw;m>7NHad#j+6mBjXo
z{a&1(?`KuoXsKGQ8U;P5P)V*)QdCD~3R)4>#6eHs5ws%S5MSs_=h(51d|i>7czv$9
z*4z$yWY4Ku=$&W=TH>wuXL8;XSUNi9`Xs;5nCeJm+6q=6XN-x+_P{OUKh)n0xaQP+
z>C~0I!1)2%=}lWWckjr&{|crpijp$a)>`4UuDKv{?}{S%W{+hDyqRvPkJwJ#a7xzm
xZvy5g%=DLZe06mr-QiCLGx%S1<1d*~)6aFOk*-nSf<(?s{|Ebv-ugeW^A}_#SN#A0

diff --git a/Regfiles/Sysprep/Disable_Search_History.reg b/Regfiles/Sysprep/Disable_Search_History.reg
deleted file mode 100644
index 5b3cbdf3096e6cc34027c455de5b5bd9084bf74f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmZ9Iu?oUK5JaaI{D<HNh>eY6rGgeV3R)NuP0l1J2_(^wpI6_V1~Dwh?e5&p%<b#B
zQ=(L%GF2+%X)U9OUZGOCYC3b!ges%<v<1&W6Y7+DsJ;e7R~>i8^k#1Uq_b|k_SDuW
z=$>E+6obZJHOpT+jy=6AZ)zQNN9&{L<HP8}<Q?8pzBYKckX4S&&{@G1z>_ic!TgrG
zuPO66VentJ{$n|R-fUhHc0&=22j{M*CHV~O;nd9E%;N7ib0(WTgz9O+A1a*X+#|O)
LySpZu9oqX1RlZ6R

diff --git a/Regfiles/Undo/Enable_Search_Highlights.reg b/Regfiles/Undo/Enable_Search_Highlights.reg
deleted file mode 100644
index d8946c3eb81613727e5be2c23f055c0c6c1dec03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 492
zcmZ9J%}c{T5XIlQ;Qz4nq=#xfcu~Bl0j21nT1AYMe#97P6WFZ8{`2Z@$M})5Y<AvE
z-pres&yNQcDz#LlMzx&A%9P`)738(SlMpRH71-&XxF=eGOYo8QHRSB5XZNJdG2p*a
zGtITaa=PU^gSpTv=n{U8wQApBwRfqsG1eOYLI<!ttf(*JI()Heu-pM0wL5M1P<Lw0
z;k;|l)ICvoL`RRB>Rc1L9fNLk2cDoY0jIo`UZ~QT;tbEV>GAmMHkNKxP09C$THk8x
z&MD^n>p$9o6V>Nrd^T-;U148zCh(tiW_=`Zex|xqU#HBaA>w(DZ4+@D-{<gmD{(tt
DF_2bc

diff --git a/Regfiles/Undo/Enable_Search_History.reg b/Regfiles/Undo/Enable_Search_History.reg
deleted file mode 100644
index 33937fb389742a93692d28495470d1da4cfd646f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 408
zcmZ9I-Acni5QV>M!FLFK0MQF?DqgjPN@*{mRf-X*ZEORQKvE5TdG*_^Kco!H&Y9Uc
zbM}0FK2T7yrlO@GAth&Htzk#a-pa^sA*#d)_x5YMg}4-7a>luF%1Jy|)`oF@$qR43
zPB`AtSY67pVrzH%vn}xNBgZ3SChlGE%z(L?Qqhb%@tj-pl+3&0Rb6f5%B@UgTFFwW
z@6gMRc4zXv`=VAs>1_8mf%9Kk$ahBYXCvcN)Yjw1d}!|@Zp%9}<IZ13PX4;ErpL8T
UwkoT=`_Z-F+#xRh91Ko=0|&H6;Q#;t

diff --git a/Scripts/Get.ps1 b/Scripts/Get.ps1
index fb39bf2..e1d2f6b 100644
--- a/Scripts/Get.ps1
+++ b/Scripts/Get.ps1
@@ -27,7 +27,6 @@ param (
     [switch]$EnableWindowsSandbox,
     [switch]$EnableWindowsSubsystemForLinux,
     [switch]$DisableTelemetry,
-    [switch]$DisableSearchHistory,
     [switch]$DisableFastStartup,
     [switch]$DisableBitlockerAutoEncryption,
     [switch]$DisableModernStandbyNetworking,
@@ -73,7 +72,6 @@ param (
     [switch]$DisableNotepadAI,
     [switch]$DisableEdgeAI,
 	[switch]$DisableChromeAI,
-    [switch]$DisableSearchHighlights,
     [switch]$DisableWidgets,
     [switch]$HideChat,
     [switch]$EnableEndTask,
diff --git a/Tests/FeatureParameterContracts.Tests.ps1 b/Tests/FeatureParameterContracts.Tests.ps1
index e991457..167f354 100644
--- a/Tests/FeatureParameterContracts.Tests.ps1
+++ b/Tests/FeatureParameterContracts.Tests.ps1
@@ -104,4 +104,28 @@ Describe 'FeatureId parameter contracts' {
 
         $missing | Should -HaveCount 0 -Because ($missing -join ', ')
     }
+
+    It 'accounts for every Win11Debloat.ps1 parameter as a FeatureId or a control parameter' {
+        $tokens = $null
+        $parseErrors = $null
+        $ast = [System.Management.Automation.Language.Parser]::ParseFile($script:Win11DebloatPath, [ref]$tokens, [ref]$parseErrors)
+        $parseErrors | Should -BeNullOrEmpty
+
+        $assignment = $ast.Find({
+            param($node)
+            $node -is [System.Management.Automation.Language.AssignmentStatementAst] -and $node.Left.Extent.Text -eq '$script:ControlParams'
+        }, $true)
+        $assignment | Should -Not -BeNullOrEmpty
+
+        $controlParameters = @(
+            $assignment.Right.FindAll({ param($node) $node -is [System.Management.Automation.Language.StringConstantExpressionAst] }, $true) |
+                ForEach-Object { $_.Value }
+        )
+        $unaccounted = @(
+            Get-ScriptParameterNames -Path $script:Win11DebloatPath |
+                Where-Object { $script:Features.FeatureId -notcontains $_ -and $controlParameters -notcontains $_ }
+        )
+
+        $unaccounted | Should -HaveCount 0 -Because ($unaccounted -join ', ')
+    }
 }
diff --git a/Win11Debloat.ps1 b/Win11Debloat.ps1
index 572cb0e..2358546 100644
--- a/Win11Debloat.ps1
+++ b/Win11Debloat.ps1
@@ -25,7 +25,6 @@ param (
     [switch]$EnableWindowsSandbox,
     [switch]$EnableWindowsSubsystemForLinux,
     [switch]$DisableTelemetry,
-    [switch]$DisableSearchHistory,
     [switch]$DisableFastStartup,
     [switch]$DisableBitlockerAutoEncryption,
     [switch]$DisableModernStandbyNetworking,
@@ -37,7 +36,6 @@ param (
     [switch]$DisableBing,
     [switch]$DisableNotifications,
     [switch]$DisableStoreSearchSuggestions,
-    [switch]$DisableSearchHighlights,
     [switch]$DisableDesktopSpotlight,
     [switch]$HideDesktopSpotlightIcon,
     [switch]$EnableDesktopSpotlight,