From f7e6f88b9c2b847ea802f0c28924c4ef95a0f62c Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 2 Oct 2021 19:30:59 -0600
Subject: [PATCH] Merge duplicate efforts to restore UAC defaults

---
 scripts/auto_setup.py     |  1 -
 scripts/wk/cfg/repairs.py | 13 ++++++++++++-
 scripts/wk/cfg/setup.py   | 21 ---------------------
 scripts/wk/repairs/win.py |  9 +++++++--
 scripts/wk/setup/win.py   | 16 ----------------
 5 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py
index 68950f29..b8118bc0 100644
--- a/scripts/auto_setup.py
+++ b/scripts/auto_setup.py
@@ -123,7 +123,6 @@ BASE_MENUS = {
       MenuEntry('Enable System Restore',    'auto_system_restore_enable'),
       MenuEntry('Set System Restore Size',  'auto_system_restore_set_size'),
       MenuEntry('Enable Windows Updates',   'auto_windows_updates_enable'),
-      MenuEntry('User Account Control',     'auto_restore_default_uac'),
       MenuEntry('Windows Activation',       'auto_activate_windows'),
       MenuEntry('Windows Explorer',         'auto_config_explorer'),
       MenuEntry(r'Windows\Temp Fix',        'auto_windows_temp_fix'),
diff --git a/scripts/wk/cfg/repairs.py b/scripts/wk/cfg/repairs.py
index 4875b0a9..657559d1 100644
--- a/scripts/wk/cfg/repairs.py
+++ b/scripts/wk/cfg/repairs.py
@@ -46,12 +46,23 @@ POWER_PLANS = {
   'Custom':           '01189998-8199-9119-725c-ccccccccccc3',
   'High Performance': '8c5e7fda-e8bf-4a96-9a85-a6e23a8c635c',
   }
-REG_UAC_DEFAULT_SETTINGS = {
+REG_UAC_DEFAULTS_WIN7 = {
+  'HKLM': {
+    r'Software\Microsoft\Windows\CurrentVersion\Policies\System': (
+      ('ConsentPromptBehaviorAdmin', 5, 'DWORD'),
+      ('EnableLUA', 1, 'DWORD'),
+      ('PromptOnSecureDesktop', 1, 'DWORD'),
+      ),
+    },
+  }
+REG_UAC_DEFAULTS_WIN10 = {
   'HKLM': {
     r'Software\Microsoft\Windows\CurrentVersion\Policies\System': (
       ('ConsentPromptBehaviorAdmin', 5, 'DWORD'),
       ('ConsentPromptBehaviorUser', 3, 'DWORD'),
+      ('EnableInstallerDetection', 1, 'DWORD'),
       ('EnableLUA', 1, 'DWORD'),
+      ('EnableVirtualization', 1, 'DWORD'),
       ('PromptOnSecureDesktop', 1, 'DWORD'),
       ),
     },
diff --git a/scripts/wk/cfg/setup.py b/scripts/wk/cfg/setup.py
index c9af5b92..887cda9f 100644
--- a/scripts/wk/cfg/setup.py
+++ b/scripts/wk/cfg/setup.py
@@ -121,27 +121,6 @@ REG_OPEN_SHELL_SETTINGS = {
       ),
     },
   }
-REG_UAC_DEFAULTS_WIN7 = {
-  'HKLM': {
-    r'Software\Microsoft\Windows\CurrentVersion\Policies\System': (
-      ('ConsentPromptBehaviorAdmin', 5, 'DWORD'),
-      ('EnableLUA', 1, 'DWORD'),
-      ('PromptOnSecureDesktop', 1, 'DWORD'),
-      ),
-    },
-  }
-REG_UAC_DEFAULTS_WIN10 = {
-  'HKLM': {
-    r'Software\Microsoft\Windows\CurrentVersion\Policies\System': (
-      ('ConsentPromptBehaviorAdmin', 5, 'DWORD'),
-      ('ConsentPromptBehaviorUser', 3, 'DWORD'),
-      ('EnableInstallerDetection', 1, 'DWORD'),
-      ('EnableLUA', 1, 'DWORD'),
-      ('EnableVirtualization', 1, 'DWORD'),
-      ('PromptOnSecureDesktop', 1, 'DWORD'),
-      ),
-    },
-  }
 UBLOCK_ORIGIN_URLS = {
   'Google Chrome':    'https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm',
   'Microsoft Edge':   'https://microsoftedge.microsoft.com/addons/detail/ublock-origin/odfafepnkmbhccpbejgmiehpchacaeak',
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 0f6d8f46..870a1df6 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -18,7 +18,8 @@ from wk.cfg.repairs   import (
   AUTO_REPAIR_KEY,
   BLEACH_BIT_CLEANERS,
   POWER_PLANS,
-  REG_UAC_DEFAULT_SETTINGS,
+  REG_UAC_DEFAULTS_WIN7,
+  REG_UAC_DEFAULTS_WIN10,
   WIDTH,
   )
 from wk.exe           import (
@@ -1265,7 +1266,11 @@ def reset_windows_updates():
 
 def restore_uac_defaults():
   """Restore UAC default settings."""
-  reg_write_settings(REG_UAC_DEFAULT_SETTINGS)
+  settings = REG_UAC_DEFAULTS_WIN10
+  if OS_VERSION != 10:
+    settings = REG_UAC_DEFAULTS_WIN7
+
+  reg_write_settings(settings)
 
 
 def run_chkdsk_offline():
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 5b2e5760..8579ca40 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -17,8 +17,6 @@ from wk.cfg.setup     import (
   REG_CHROME_UBLOCK_ORIGIN,
   REG_WINDOWS_EXPLORER,
   REG_OPEN_SHELL_SETTINGS,
-  REG_UAC_DEFAULTS_WIN7,
-  REG_UAC_DEFAULTS_WIN10,
   UBLOCK_ORIGIN_URLS,
   )
 from wk.exe           import kill_procs, run_program, popen_program
@@ -510,11 +508,6 @@ def auto_open_xmplay():
   TRY_PRINT.run('XMPlay...', open_xmplay)
 
 
-def auto_restore_default_uac():
-  """Restore default UAC settings."""
-  TRY_PRINT.run('User Account Control...', restore_default_uac)
-
-
 def auto_show_4k_alignment_check():
   """Display 4K alignment check."""
   TRY_PRINT.run('4K alignment Check...', check_4k_alignment, show_alert=True)
@@ -658,15 +651,6 @@ def fix_windows_temp():
     run_program(cmd)
 
 
-def restore_default_uac():
-  """Restore default UAC settings."""
-  settings = REG_UAC_DEFAULTS_WIN10
-  if OS_VERSION != 10:
-    settings = REG_UAC_DEFAULTS_WIN7
-
-  reg_write_settings(settings)
-
-
 # Install Functions
 def install_firefox():
   """Install Firefox.