Merge branch 'master' into pr/90/merge

README.md

@@ -3,21 +3,30 @@
 This project collects Powershell scripts which help to *debloat* Windows 10,
 tweak common settings and install basic software components.
 
-I develop those scripts on a Windows 10 Professional 64-Bit (English) virtual
+I test these scripts on a Windows 10 Professional 64-Bit (English) virtual
-machine. Please let me know if you encounter any issues with other Windows 10
+machine. Please let me know if you encounter any issues. Home Edition and
-versions.
+different languages are not supported. These scripts are intended for
+tech-savvy administrators, who know what they are doing and just want to
+automate this phase of their setup. If this profile does not fit you, I
+recommend using a different (more interactive) tool -- and there are a lot of
+them out there.
+
+**There is no undo**, I recommend only using these scripts on a fresh
+installation (including Windows Updates). Test everything after running them
+before doing anything else. Also there is no guarantee that everything will
+work after future updates since I cannot predict what Microsoft will do next.
 
-Home Edition and different languages are not supported. Let me know of you fork
+## Interactivity
-this repo for fixing Home Edition or a different language.
 
-Note that **there is no undo**, I recommend only using these scripts on a fresh
+The scripts are designed to run without any user-interaction. Modify them
-install (including updates). Test everything after running them before
+beforehand. If you want a more interactive approach check out
-continuing with something else. Also there is no guarantee that everything will
+[DisableWinTracking](https://github.com/10se1ucgo/DisableWinTracking) from
-work after future updates since I cannot predict what Microsoft will do next.
+[10se1ucgo](https://github.com/10se1ucgo).
 
 ## Download Latest Version
 
-Code located in the `master` branch is under development (for now).
+Code located in the `master` branch is always considered under development, but
+you'll probably want the most recent version anyway.
 
 - [Download [zip]](https://github.com/W4RH4WK/Debloat-Windows-10/archive/master.zip)
 
@@ -38,6 +47,8 @@ Unblock PowerShell scripts and modules within this directory:
 2. Edit the scripts to fit your need.
 3. Run the scripts
 4. `PS > Restart-Computer`
+5. Run `disable-windows-defender.ps1` one more time.
+6. `PS > Restart-Computer`
 
 ## Startmenu
 
@@ -84,13 +95,6 @@ App when wanting to use one. But I haven't confirmed this yet, and there is a
 workaround to re-enable it afterwards. See
 [#78](https://github.com/W4RH4WK/Debloat-Windows-10/issues/78).
 
-## Interactivity
-
-The scripts are designed to run without any user-interaction. Modify them
-beforehand. If you want a more interactive approach check out
-[DisableWinTracking](https://github.com/10se1ucgo/DisableWinTracking) from
-[10se1ucgo](https://github.com/10se1ucgo).
-
 ## Liability
 
 **All scripts are provided as is and you use them at your own risk.**

scripts/block-telemetry.ps1

@@ -11,6 +11,7 @@ sp "HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection" "AllowTelemetry" 0
 echo "Adding telemetry domains to hosts file"
 $hosts_file = "$env:systemroot\System32\drivers\etc\hosts"
 $domains = @(
+    "184-86-53-99.deploy.static.akamaitechnologies.com"
     "a-0001.a-msedge.net"
     "a-0002.a-msedge.net"
     "a-0003.a-msedge.net"
@@ -161,6 +162,7 @@ $ips = @(
     "134.170.30.202"
     "137.116.81.24"
     "157.56.106.189"
+    "184.86.53.99"
     "2.22.61.43"
     "2.22.61.66"
     "204.79.197.200"

scripts/disable-windows-defender.ps1

@@ -1,7 +1,13 @@
 #   Description:
-# This script disables Windows Defender.
+# This script disables Windows Defender. Run it once (will throw errors), then
+# reboot, run it again (this time no errors should occur) followed by another
+# reboot.
 
 Import-Module -DisableNameChecking $PSScriptRoot\..\lib\force-mkdir.psm1
+Import-Module -DisableNameChecking $PSScriptRoot\..\lib\take-own.psm1
+
+echo "Elevating priviledges for this process"
+do {} until (Elevate-Privileges SeTakeOwnershipPrivilege)
 
 $tasks = @(
     "\Microsoft\Windows\Windows Defender\Windows Defender Cache Maintenance"
@@ -26,5 +32,17 @@ sp "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows Defender" "DisableRout
 force-mkdir "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows Defender\Real-Time Protection"
 sp "HKLM:\SOFTWARE\Wow6432Node\Policies\Microsoft\Windows Defender\Real-Time Protection" "DisableRealtimeMonitoring" 1
 
+echo "Disabling Windows Defender Services"
+Takeown-Registry("HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\WinDefend")
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\WinDefend" "Start" 4
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\WinDefend" "AutorunsDisabled" 3
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\WdNisSvc" "Start" 4
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\WdNisSvc" "AutorunsDisabled" 3
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\Sense" "Start" 4
+sp "HKLM:\SYSTEM\CurrentControlSet\Services\Sense" "AutorunsDisabled" 3
+
 echo "Removing Windows Defender context menu item"
 si "HKLM:\SOFTWARE\Classes\CLSID\{09A47860-11B0-4DA5-AFA5-26D86198A780}\InprocServer32" ""
+
+echo "Removing Windows Defender GUI / tray from autorun"
+rp "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "WindowsDefender" -ea 0