Disable more unwanted services

setup.py

@@ -5,20 +5,32 @@ uninstallkey = []
 
 # Service to disable
 disabled_services = [
-    'RemoteRegistry',  # Remote access to reg
-    'WMPNetworkSvc',   # Windows Media Share
-    'Mcx2Svc',         # Media Center Extender
-    'WerSvc',          # Error reporting
-    'WPCSvc',          # Parental control
-    'helpsvc',         # Help service
-    'DPS',             # Windows Diag service
-    'SysMain',         # SuperFetcher
+    'Mcx2Svc',                                  # Media Center Extender
+    'WerSvc',                                   # Error reporting
+    'WPCSvc',                                   # Parental control
+    'helpsvc',                                  # Help service
+    'diagnosticshub.standardcollector.service', # Microsoft (R) Diagnostics Hub Standard Collector Service
+    'DiagTrack',                                # Diagnostics Tracking Service
+    'dmwappushservice',                         # WAP Push Message Routing Service (see known issues)
+    'HomeGroupListener',                        # HomeGroup Listener
+    'HomeGroupProvider',                        # HomeGroup Provider
+    'lfsvc',                                    # Geolocation Service
+    'MapsBroker',                               # Downloaded Maps Manager
+    'NetTcpPortSharing',                        # Net.Tcp Port Sharing Service
+    'RemoteAccess',                             # Routing and Remote Access
+    'RemoteRegistry',                           # Remote Registry
+    'SharedAccess',                             # Internet Connection Sharing (ICS)
+    'TrkWks',                                   # Distributed Link Tracking Client
+    'WMPNetworkSvc',                            # Windows Media Player Network Sharing Service
+    'XblAuthManager',                           # Xbox Live Auth Manager
+    'XblGameSave',                              # Xbox Live Game Save Service
+    'XboxNetApiSvc'                             # Xbox Live Networking Service
 ]
 
 def install():
     print('Disabling unwanted services')
     for service in disabled_services:
-        print('Disabling %s' % service)
+        print('    Disabling %s' % service)
         run(r'sc config %s start= disabled' % service, accept_returncodes=[0,1060])
 
     print('Enabling ping response')