Expanded Post-D7II Cleanup

* Fixes issue #4

.bin/Scripts/functions/cleanup.py

@@ -2,6 +2,24 @@
 
 from functions.common import *
 
+# STATIC VARIABLES
+D7_HKCR_CLEANUP = {
+    r'batfile\shell\{0001B4FD-9EA3-4D90-A79E-FD14BA3AB01D}': {'Recurse': True},
+    r'cmdfile\shell\{0001B4FD-9EA3-4D90-A79E-FD14BA3AB01D}': {'Recurse': True},
+    r'exefile\shell\ResourceHacker': {'Recurse': True},
+    r'regfile\shell\{0001B4FD-9EA3-4D90-A79E-FD14BA3AB01D}': {'Recurse': True},
+    }
+D7_HKCU_CLEANUP = {
+    r'Software\Malwarebytes': {'Recurse': False},
+    }
+D7_HKLM_CLEANUP = {
+    r'Software\Emsisoft': {'Recurse': False},
+    }
+HKU =  winreg.HKEY_USERS
+HKCR = winreg.HKEY_CLASSES_ROOT
+HKCU = winreg.HKEY_CURRENT_USER
+HKLM = winreg.HKEY_LOCAL_MACHINE
+
 def cleanup_adwcleaner():
     """Move AdwCleaner folders into the ClientDir."""
     source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
@@ -126,6 +144,14 @@ def cleanup_d7ii():
             except OSError:
                 pass
 
+    # Registry Items
+    for key, settings in D7_HKCR_CLEANUP.items():
+        delete_registry_key(HKCR, key, recurse=settings['Recurse'])
+    for key, settings in D7_HKCU_CLEANUP.items():
+        delete_registry_key(HKCU, key, recurse=settings['Recurse'])
+    for key, settings in D7_HKLM_CLEANUP.items():
+        delete_registry_key(HKLM, key, recurse=settings['Recurse'])
+
     # Temp items
     if os.path.exists(d7_path):
         if os.path.exists(d7_temp):
@@ -196,6 +222,27 @@ def cleanup_regbackups():
     except OSError:
         pass
 
+def delete_registry_key(hive, key, recurse=False):
+    """Delete a registry key and all it's subkeys."""
+    access = winreg.KEY_ALL_ACCESS
+
+    if recurse:
+        # Delete all subkeys first
+        with winreg.OpenKeyEx(hive, key, 0, access) as k:
+            key_info = winreg.QueryInfoKey(k)
+            for x in range(key_info[0]):
+                subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
+                delete_registry_key(hive, subkey)
+
+    # Delete key
+    winreg.DeleteKey(hive, key)
+
+def delete_registry_value(hive, key, value):
+    """Delete a registry value."""
+    access = winreg.KEY_ALL_ACCESS
+    with winreg.OpenKeyEx(hive, key, 0, access) as k:
+        winreg.DeleteValue(k, value)
+
 if __name__ == '__main__':
     print("This file is not meant to be called directly.")
 

.bin/Scripts/functions/common.py

@@ -33,6 +33,7 @@ COLORS = {
 }
 try:
     HKU =  winreg.HKEY_USERS
+    HKCR = winreg.HKEY_CLASSES_ROOT
     HKCU = winreg.HKEY_CURRENT_USER
     HKLM = winreg.HKEY_LOCAL_MACHINE
 except NameError:

.bin/Scripts/functions/setup.py

@@ -5,6 +5,8 @@ from functions.update import *
 from settings.sources import *
 
 # STATIC VARIABLES
+HKU =  winreg.HKEY_USERS
+HKCR = winreg.HKEY_CLASSES_ROOT
 HKCU = winreg.HKEY_CURRENT_USER
 HKLM = winreg.HKEY_LOCAL_MACHINE
 MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(

.bin/Scripts/post_d7.py

@@ -11,7 +11,7 @@ from functions.cleanup import *
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Post-d7II Work'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\User Checklist ({USERNAME}).log'.format(
+global_vars['LogFile'] = r'{LogDir}\Post-d7II Work.log'.format(
     **global_vars, **global_vars['Env'])
 
 if __name__ == '__main__':

.bin/Scripts/settings/launchers.py

@@ -19,6 +19,12 @@ LAUNCHERS = {
             'L_ITEM': 'install_eset_nod32_av.py',
             'L_ELEV': 'True',
             },
+        'Post-d7II Work': {
+            'L_TYPE': 'PyScript',
+            'L_PATH': 'Scripts',
+            'L_ITEM': 'post_d7.py',
+            'L_ELEV': 'True',
+            },
         'System Checklist': {
             'L_TYPE': 'PyScript',
             'L_PATH': 'Scripts',