fix: safer SuperFetch filters (2)

Author: RadNotRed

src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Superfetch/Disable SuperFetch.cmd

@@ -27,11 +27,21 @@ setlocal EnableDelayedExpansion
 
 :: Remove lower filters for rdyboost driver
 set "key=HKLM\SYSTEM\CurrentControlSet\Control\Class\{71a27cdd-812a-11d0-bec7-08002be2092f}"
-for /f "skip=1 tokens=3*" %%a in ('reg query !key! /v "LowerFilters"') do (set val=%%a)
-set val=!val:rdyboost\0=!
-set val=!val:\0rdyboost=!
-set val=!val:rdyboost=!
-reg add "!key!" /v "LowerFilters" /t REG_MULTI_SZ /d "!val!" /f > nul
+set "val="
+for /f "skip=1 tokens=3*" %%a in ('reg query "!key!" /v "LowerFilters" 2^>nul') do (
+    set "val=%%a"
+    if not "%%b"=="" set "val=!val! %%b"
+)
+if defined val (
+    set val=!val:rdyboost\0=!
+    set val=!val:\0rdyboost=!
+    set val=!val:rdyboost=!
+    if defined val (
+        reg add "!key!" /v "LowerFilters" /t REG_MULTI_SZ /d "!val!" /f > nul
+    ) else (
+        reg delete "!key!" /v "LowerFilters" /f > nul 2>&1
+    )
+)
 
 :: Disable ReadyBoost
 reg add "HKLM\SYSTEM\CurrentControlSet\Services\rdyboost" /v "Start" /t REG_DWORD /d "4" /f > nul
@@ -45,4 +55,4 @@ if "%~1"=="/silent" exit /b
 
 echo Finished, please reboot your device for changes to apply.
 pause
-exit /b
+exit /b

src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Superfetch/Enable SuperFetch (default).cmd

@@ -27,12 +27,19 @@ setlocal EnableDelayedExpansion
 
 :: Add lower filters for rdyboost driver
 set "key=HKLM\SYSTEM\CurrentControlSet\Control\Class\{71a27cdd-812a-11d0-bec7-08002be2092f}"
-for /f "skip=1 tokens=3*" %%a in ('reg query "!key!" /v "LowerFilters"') do (set val=%%a)
+set "val="
+for /f "skip=1 tokens=3*" %%a in ('reg query "!key!" /v "LowerFilters" 2^>nul') do (
+    set "val=%%a"
+    if not "%%b"=="" set "val=!val! %%b"
+)
 
-echo "!val!" > nul | findstr /c:"rdyboost"
-if !errorlevel! NEQ 0 (
-	set "val=!val!\0rdyboost"
-	reg add "!key!" /v "LowerFilters" /t REG_MULTI_SZ /d "!val!" /f
+if not defined val (
+    reg add "!key!" /v "LowerFilters" /t REG_MULTI_SZ /d "rdyboost" /f > nul
+) else (
+    echo "!val!" | findstr /c:"rdyboost" > nul
+    if !errorlevel! NEQ 0 (
+        reg add "!key!" /v "LowerFilters" /t REG_MULTI_SZ /d "!val!\0rdyboost" /f > nul
+    )
 )
 
 :: Enable ReadyBoost
@@ -48,4 +55,4 @@ if "%~1"=="/silent" exit /b
 
 echo Finished, please reboot your device for changes to apply.
 pause
-exit /b
+exit /b