From 0c21576c428a0a6333d8711ff7d4c3e2e81e3310 Mon Sep 17 00:00:00 2001
From: Michael Maltsev <4129781+m417z@users.noreply.github.com>
Date: Mon, 26 Aug 2024 10:50:46 +0300
Subject: [PATCH] Revert "Remove some special cases"

This reverts commit 7511edbe9db72b34dbf5820518b35ebf132d22e8.
---
 scripts/01_extract_mod_symbols.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/scripts/01_extract_mod_symbols.py b/scripts/01_extract_mod_symbols.py
index 285837c9d..9453c4ff6 100644
--- a/scripts/01_extract_mod_symbols.py
+++ b/scripts/01_extract_mod_symbols.py
@@ -14,7 +14,16 @@
 }
 
 SYMBOL_BLOCK_MODULES_BY_BLOCK_NAME: dict[tuple[str, str], tuple[str, ...]] = {
+    ('aerexplorer', 'efHooks'): ('ExplorerFrame.dll',),
+    ('aerexplorer', 'isCplHooks'): ('ExplorerFrame.dll',),
+    ('aerexplorer', 'shHooks'): ('shell32.dll',),
+    ('aerexplorer', 'storageHooks'): ('windows.storage.dll',),
+    ('aero-flyout-fix', 'actioncenterHooks'): ('ActionCenter.dll',),
+    ('aero-flyout-fix', 'sndvolHooks'): ('SndVol.exe',),
+    ('aero-flyout-fix', 'stobjectHooks'): ('stobject.dll',),
+    ('aero-flyout-fix', 'timedateHooks'): ('timedate.cpl',),
     ('aero-tray', 'hooks'): ('explorer.exe',),
+    ('classic-file-picker-dialog', 'symbolHook'): ('comdlg32.dll',),
     ('desktop-watermark-tweaks', 'hooks'): ('shell32.dll',),
     ('dwm-ghost-mods', 'hooks'): ('dwmghost.dll',),
     ('dwm-unextend-frames', 'comctl32_hook'): ('comctl32.dll',),
@@ -25,17 +34,23 @@
     ('taskbar-button-click', 'symbolHooks'): ('Taskbar.dll', 'explorer.exe',),
     ('taskbar-clock-customization', 'taskbarHooks10'): ('explorer.exe',),
     ('taskbar-clock-customization', 'taskbarHooks11'): ('Taskbar.View.dll',),
+    ('taskbar-thumbnail-reorder', 'symbolHooks'): ('Taskbar.dll', 'explorer.exe',),
     ('unlock-taskmgr-server', 'hook'): ('taskmgr.exe',),
     ('uxtheme-hook', 'duiHooks'): ('dui70.dll',),
     ('uxtheme-hook', 'hooks'): ('uxtheme.dll', 'uxinit.dll', 'themeui.dll',),
+    ('virtual-desktop-taskbar-order', 'taskbarSymbolHooks'): ('Taskbar.dll', 'explorer.exe',),
+    ('virtual-desktop-taskbar-order', 'twinuiPcshellSymbolHooks'): ('twinui.pcshell.dll',),
     ('win32-tray-clock-experience', 'hooks'): ('Taskbar.dll', 'explorer.exe',),
     ('win7-style-uac-dim', 'hooks'): ('consent.exe',),
     ('windows-7-clock-spacing', 'hooks'): ('explorer.exe',),
 }
 
 SYMBOL_BLOCK_MODULES_BY_FUNCTION: dict[str, tuple[str, ...]] = {
+    'HookTaskbarSymbols': ('Taskbar.dll', 'explorer.exe',),
     'HookTaskbarDllSymbols': ('Taskbar.dll', 'explorer.exe',),
     'HookTaskbarViewDllSymbols': ('Taskbar.View.dll',),
+    'HookExplorerFrameSymbols': ('ExplorerFrame.dll',),
+    'HookFileExplorerExtensionsSymbols': ('FileExplorerExtensions.dll',),
     'HookICMH_CAODTM': (
         'shell32.dll',
         'ExplorerFrame.dll',
@@ -130,7 +145,9 @@ def deduce_symbol_block_target_modules(mod_name: str, mod_source: str, symbol_bl
     # Try the new rules as defined in pr_validation.py.
     target_from_name = get_target_module_from_symbol_block_name(symbol_block_name)
     if target_from_name:
-        return [target_from_name.lower()]
+        # Special case for aerexplorer
+        if target_from_name.lower() != 'windowsstorage.dll':
+            return [target_from_name.lower()]
 
     line_num = 1 + mod_source[: symbol_block_match.start()].count('\n')
     previous_line = mod_source.splitlines()[line_num - 2]