Add task for removing MS Edge & OneDrive when run as other user or sysprep mode #366

This should fix issues with `ms-gamingoverlay` popups after uninstalling the Xbox Game Bar

Appslist.txt

@@ -105,6 +105,7 @@ XING                                           # Professional networking platfor
 #Microsoft.Edge                                # Edge browser (Can only be uninstalled in European Economic Area)
 #Microsoft.GamingApp                           # Modern Xbox Gaming App, required for installing some PC games
 #Microsoft.GetHelp                             # Required for some Windows 11 Troubleshooters and support interactions
+#Microsoft.M365Companions                      # Microsoft 365 (Business) Calendar, Files and People mini-apps, these apps may be reinstalled if enabled by your Microsoft 365 admin
 #Microsoft.MSPaint                             # Paint 3D (Modern paint application with 3D features)
 #Microsoft.OneDrive                            # OneDrive consumer cloud storage client
 #Microsoft.OutlookForWindows                   # New mail app: Outlook for Windows

Assets/Menus/Info

@@ -56,7 +56,7 @@ Start
 - Disable the Phone Link mobile devices integration in the start menu. (W11 only)
 
 Other
-- Disable Xbox game/screen recording, this also stops gaming overlay popups.
+- Disable Xbox Game Bar game/screen recording and controller integration. This also disables `msgaming overlay` popups.
 - Disable Fast Start-up to ensure a full shutdown.
 - Disable network connectivity during Modern Standby to reduce battery drain. (W11 only)
 - Option to apply changes to a different user, instead of the currently logged in user.

Get.ps1

@@ -17,6 +17,7 @@ param (
     [switch]$RemoveW11Outlook,
     [switch]$ForceRemoveEdge,
     [switch]$DisableDVR,
+    [switch]$DisableControllerOverlay,
     [switch]$DisableTelemetry,
     [switch]$DisableFastStartup,
     [switch]$DisableModernStandbyNetworking,
@@ -64,6 +65,7 @@ param (
     [switch]$ExplorerToThisPC,
     [switch]$ExplorerToDownloads,
     [switch]$ExplorerToOneDrive,
+    [switch]$NoRestartExplorer,
     [switch]$DisableOnedrive, [switch]$HideOnedrive,
     [switch]$Disable3dObjects, [switch]$Hide3dObjects,
     [switch]$DisableMusic, [switch]$HideMusic,

README.md

@@ -152,7 +152,7 @@ Below is an overview of the key features and functionality offered by Win11Deblo
 
 #### Other
 
-- Disable Xbox game/screen recording, this also stops gaming overlay popups.
+- Disable Xbox Game Bar game/screen recording and controller integration. This also disables the annoying `msgaming overlay` popups if you uninstalled the Xbox Game Bar app.
 - Disable Fast Start-up to ensure a full shutdown.
 - Disable network connectivity during Modern Standby to reduce battery drain. (W11 only)
 - Option to [apply changes to a different user](https://github.com/Raphire/Win11Debloat/wiki/Advanced-Features#running-as-another-user), instead of the currently logged in user.
@@ -297,6 +297,7 @@ These apps will not be removed by Win11Debloat unless explicitly selected by the
     Miscellaneous apps:
     - Microsoft.Edge (Edge browser, only removeable in the EEA)
     - Microsoft.GetHelp (Required for some Windows 11 Troubleshooters)
+    - Microsoft.M365Companions (Microsoft 365 Business Calendar, Files and People mini-apps, these apps may be reinstalled if enabled by your Microsoft 365 admin)
     - Microsoft.MSPaint (Paint 3D)
     - Microsoft.OutlookForWindows (New mail app)
     - Microsoft.OneDrive (OneDrive consumer)

Regfiles/Disable_Controller_Game_Bar_Integration.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable allow your controller to open Game Bar
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000000

Regfiles/Disable_DVR.reg

@@ -3,5 +3,8 @@ Windows Registry Editor Version 5.00
 [HKEY_CURRENT_USER\System\GameConfigStore]
 "GameDVR_Enabled"=dword:00000000
 
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR]
+"AppCaptureEnabled"=dword:00000000
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\GameDVR]
 "AllowGameDVR"=dword:00000000

Regfiles/Sysprep/Disable_Controller_Game_Bar_Integration.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Disable allow your controller to open Game Bar
+[hkey_users\default\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000000

Regfiles/Sysprep/Disable_DVR.reg

@@ -3,5 +3,8 @@ Windows Registry Editor Version 5.00
 [hkey_users\default\System\GameConfigStore]
 "GameDVR_Enabled"=dword:00000000
 
+[hkey_users\default\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR]
+"AppCaptureEnabled"=dword:00000000
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\GameDVR]
 "AllowGameDVR"=dword:00000000

Regfiles/Sysprep/Uninstall_Microsoft_Edge.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[hkey_users\default\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce]
+"UninstallMicrosoftEdge"="cmd.exe /c winget uninstall --accept-source-agreements --disable-interactivity --id Microsoft.Edge"

Regfiles/Sysprep/Uninstall_Microsoft_OneDrive.reg

@@ -0,0 +1,4 @@
+Windows Registry Editor Version 5.00
+
+[hkey_users\default\SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce]
+"UninstallMicrosoftOneDrive"="cmd.exe /c winget uninstall --accept-source-agreements --disable-interactivity --id Microsoft.OneDrive"

Regfiles/Undo/Enable_Controller_Game_Bar_Integration.reg

@@ -0,0 +1,5 @@
+Windows Registry Editor Version 5.00
+
+; Enable allow your controller to open Game Bar
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\GameBar]
+"UseNexusForGameBarEnabled"=dword:00000001

Regfiles/Undo/Enable_DVR.reg

@@ -3,5 +3,8 @@ Windows Registry Editor Version 5.00
 [HKEY_CURRENT_USER\System\GameConfigStore]
 "GameDVR_Enabled"=dword:00000001
 
+[HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\GameDVR]
+"AppCaptureEnabled"=dword:00000001
+
 [HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\GameDVR]
 "AllowGameDVR"=dword:00000001

Win11Debloat.ps1

@@ -19,6 +19,7 @@ param (
     [switch]$RemoveW11Outlook,
     [switch]$ForceRemoveEdge,
     [switch]$DisableDVR,
+    [switch]$DisableControllerOverlay,
     [switch]$DisableTelemetry,
     [switch]$DisableFastStartup,
     [switch]$DisableModernStandbyNetworking,
@@ -66,6 +67,7 @@ param (
     [switch]$ExplorerToThisPC,
     [switch]$ExplorerToDownloads,
     [switch]$ExplorerToOneDrive,
+    [switch]$NoRestartExplorer,
     [switch]$DisableOnedrive, [switch]$HideOnedrive,
     [switch]$Disable3dObjects, [switch]$Hide3dObjects,
     [switch]$DisableMusic, [switch]$HideMusic,
@@ -381,8 +383,18 @@ function RemoveApps {
                 Write-Host "Error: WinGet is either not installed or is outdated, $app could not be removed" -ForegroundColor Red
             }
             else {
-                # Uninstall app via winget
+                $appName = $app -replace '\.', '_'
+
+                # Uninstall app via winget, or create a scheduled task to uninstall it later
+                if ($script:Params.ContainsKey("User")) {
+                    RegImport "Adding scheduled task to uninstall $app for user $(GetUserName)..." "Uninstall_$($appName).reg"
+                }
+                elseif ($script:Params.ContainsKey("Sysprep")) {
+                    RegImport "Adding scheduled task to uninstall $app after new users log in..." "Uninstall_$($appName).reg"
+                }
+                else {
                     Strip-Progress -ScriptBlock { winget uninstall --accept-source-agreements --disable-interactivity --id $app } | Tee-Object -Variable wingetOutput
+                }
 
                 If (($app -eq "Microsoft.Edge") -and (Select-String -InputObject $wingetOutput -Pattern "Uninstall failed with exit code")) {
                     Write-Host "Unable to uninstall Microsoft Edge via Winget" -ForegroundColor Red
@@ -641,7 +653,7 @@ function RegImport {
 
 # Restart the Windows Explorer process
 function RestartExplorer {
-    if ($script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User")) {
+    if ($script:Params.ContainsKey("Sysprep") -or $script:Params.ContainsKey("User") -or $script:Params.ContainsKey("NoRestartExplorer")) {
         return
     }
 
@@ -979,6 +991,7 @@ function DisplayCustomModeOptions {
             AddParameter 'RemoveW11Outlook' 'Remove the new Outlook for Windows app'
             AddParameter 'RemoveGamingApps' 'Remove the Xbox App and Xbox Gamebar'
             AddParameter 'DisableDVR' 'Disable Xbox game/screen recording'
+            AddParameter 'DisableControllerOverlay' 'Disable opening the Xbox Game Bar with a controller'
         }
         '3' {
             Write-Output "You have selected $($script:SelectedApps.Count) apps for removal"
@@ -987,8 +1000,9 @@ function DisplayCustomModeOptions {
 
             Write-Output ""
 
-            if ($( Read-Host -Prompt "Disable Xbox game/screen recording? This also stops gaming overlay popups (y/n)" ) -eq 'y') {
+            if ($( Read-Host -Prompt "Disable Game Bar integration for controller and game/screen recording? This also stops msgaming overlay popups (y/n)" ) -eq 'y') {
                 AddParameter 'DisableDVR' 'Disable Xbox game/screen recording'
+                AddParameter 'DisableControllerOverlay' 'Disable opening the Xbox Game Bar with a controller'
             }
         }
     }
@@ -1162,11 +1176,14 @@ function DisplayCustomModeOptions {
                 }
             }
 
+            # Don't show option for users running build 26200 and above, as this setting was removed in this build
+            if ($WinVersion -lt 26200) {
                 Write-Output ""
 
                 if ($( Read-Host -Prompt "   Disable the recommended section in the start menu? This applies to all users (y/n)" ) -eq 'y') {
                     AddParameter 'DisableStartRecommended' 'Disable the recommended section in the start menu.'
                 }
+            }
 
             Write-Output ""
 
@@ -1794,6 +1811,10 @@ switch ($script:Params.Keys) {
         RegImport "> Disabling Xbox game/screen recording..." "Disable_DVR.reg"
         continue
     }
+    'DisableControllerOverlay' {
+        RegImport "> Disabling the option of opening the Xbox Game Bar with a controller..." "Disable_Controller_Game_Bar_Integration.reg"
+        continue
+    }
     'DisableTelemetry' {
         RegImport "> Disabling telemetry, diagnostic data, activity history, app-launch tracking and targeted ads..." "Disable_Telemetry.reg"
         continue