From 8412bd64d9ee5aaf4246a16364b0b6571c867697 Mon Sep 17 00:00:00 2001
From: Amrsatrio <satrionareswara@yahoo.com>
Date: Wed, 11 Oct 2023 15:10:02 +0700
Subject: [PATCH] Symbols: Reworked the symbol manager so that symbols don't
 need to be successfully downloaded in succession - This should fix start menu
 not working (at all!) on users who upgraded into 22621.2428 not through
 22621.2361 with EP installed. Updating into this version will redownload
 symbols due to changes in the way they are managed. - 22621.2428 was just
 released to the general public, but symbols for twinui.pcshell.dll are not
 available at the time of writing. Despite that, StartDocked.dll and
 StartUI.dll are still the same as 22621.2361. - I've also removed hardcoded
 and stuffed-together offsets of really old DLL versions to make the code more
 concise.

---
 ExplorerPatcher/StartMenu.c |    4 +-
 ExplorerPatcher/dllmain.c   |  226 ++---
 ExplorerPatcher/symbols.c   | 1589 +++++++++++------------------------
 ExplorerPatcher/symbols.h   |   16 +-
 ExplorerPatcher/utility.h   |   10 +-
 5 files changed, 653 insertions(+), 1192 deletions(-)

diff --git a/ExplorerPatcher/StartMenu.c b/ExplorerPatcher/StartMenu.c
index 981a721..a0f1691 100644
--- a/ExplorerPatcher/StartMenu.c
+++ b/ExplorerPatcher/StartMenu.c
@@ -765,7 +765,7 @@ BOOL NeedsRo_PositionStartMenuForMonitor(
     return TRUE;
 }
 
-DWORD GetStartMenuPosition(FARPROC SHRegGetValueFromHKCUHKLMFunc)
+DWORD GetStartMenuPosition(t_SHRegGetValueFromHKCUHKLM SHRegGetValueFromHKCUHKLMFunc)
 {
     DWORD dwSize = sizeof(DWORD);
 
@@ -776,7 +776,7 @@ DWORD GetStartMenuPosition(FARPROC SHRegGetValueFromHKCUHKLMFunc)
         SRRF_RT_REG_DWORD,
         NULL,
         &dwTaskbarAl,
-        (LPDWORD)(&dwSize)
+        &dwSize
     ) != ERROR_SUCCESS)
     {
         dwTaskbarAl = 1;
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 9574401..81c3cee 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -164,7 +164,7 @@ DWORD dwSpotlightDesktopMenuMask = 0;
 DWORD dwSpotlightUpdateSchedule = 0;
 int Code = 0;
 HRESULT InjectStartFromExplorer();
-void InvokeClockFlyout();
+BOOL InvokeClockFlyout();
 void WINAPI Explorer_RefreshUI(int unused);
 int (*SHWindowsPolicy)(REFIID);
 
@@ -911,79 +911,79 @@ BOOL CALLBACK ToggleImmersiveCallback(HWND hWnd, LPARAM lParam)
     return TRUE;
 }
 
-void ToggleHelp()
+BOOL ToggleHelp()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 505, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 505, 0);
 }
 
-void ToggleRunDialog()
+BOOL ToggleRunDialog()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 502, MAKELPARAM(MOD_WIN, 0x52));
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 502, MAKELPARAM(MOD_WIN, 0x52));
 }
 
-void ToggleSystemProperties()
+BOOL ToggleSystemProperties()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 512, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 512, 0);
 }
 
-void FocusSystray()
+BOOL FocusSystray()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 514, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 514, 0);
 }
 
-void TriggerAeroShake()
+BOOL TriggerAeroShake()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 515, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 515, 0);
 }
 
-void PeekDesktop()
+BOOL PeekDesktop()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 516, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 516, 0);
 }
 
-void ToggleEmojiPanel()
+BOOL ToggleEmojiPanel()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 579, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 579, 0);
 }
 
-void ShowDictationPanel()
+BOOL ShowDictationPanel()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 577, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 577, 0);
 }
 
-void ToggleClipboardViewer()
+BOOL ToggleClipboardViewer()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 578, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 578, 0);
 }
 
-void ToggleSearch()
+BOOL ToggleSearch()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 507, MAKELPARAM(MOD_WIN, 0x53));
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 507, MAKELPARAM(MOD_WIN, 0x53));
 }
 
-void ToggleTaskView()
+BOOL ToggleTaskView()
 {
-    EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 11);
+    return EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 11);
 }
 
-void ToggleWidgetsPanel()
+BOOL ToggleWidgetsPanel()
 {
-    EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 0x66);
+    return EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 0x66);
 }
 
-void ToggleMainClockFlyout()
+BOOL ToggleMainClockFlyout()
 {
-    EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 0x6B);
+    return EnumThreadWindows(GetWindowThreadProcessId(FindWindowExW(NULL, NULL, L"ApplicationManager_ImmersiveShellWindow", NULL), NULL), ToggleImmersiveCallback, 0x6B);
 }
 
-void ToggleNotificationsFlyout()
+BOOL ToggleNotificationsFlyout()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 591, 0);
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 591, 0);
 }
 
-void ToggleActionCenter()
+BOOL ToggleActionCenter()
 {
-    PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 500, MAKELPARAM(MOD_WIN, 0x41));
+    return PostMessageW(FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL), WM_HOTKEY, 500, MAKELPARAM(MOD_WIN, 0x41));
 }
 
 #ifdef _WIN64
@@ -1734,7 +1734,7 @@ LONG_PTR __stdcall CTaskBtnGroup_GetIdealSpanHook(ITaskBtnGroup* _this, LONG_PTR
     return ret;
 }
 
-void explorer_QISearch(void* that, LPCQITAB pqit, REFIID riid, void** ppv)
+HRESULT explorer_QISearch(void* that, LPCQITAB pqit, REFIID riid, void** ppv)
 {
     HRESULT hr = QISearch(that, pqit, riid, ppv);
     if (SUCCEEDED(hr) && IsEqualGUID(pqit[0].piid, &IID_ITaskGroup) && bPinnedItemsActAsQuickLaunch)
@@ -1907,6 +1907,8 @@ DWORD FixTaskbarAutohide(DWORD unused)
         }
     }
     SetEvent(hCanStartSws);
+
+    return 0;
 }
 #endif
 #pragma endregion
@@ -2871,7 +2873,7 @@ BOOL CheckIfMenuContainsOwnPropertiesItem(HMENU hMenu)
             mii.cbSize = sizeof(MENUITEMINFO);
             mii.fMask = MIIM_DATA | MIIM_ID;
             BOOL b = GetMenuItemInfoW(hMenu, i, TRUE, &mii);
-            if (b && (mii.wID >= 12000 && mii.wID <= 12200) && mii.dwItemData == CheckForUpdatesThread)
+            if (b && (mii.wID >= 12000 && mii.wID <= 12200) && mii.dwItemData == (ULONG_PTR)CheckForUpdatesThread)
             {
                 return TRUE;
             }
@@ -3064,33 +3066,6 @@ BOOL TrackPopupMenuHook(
 #define TB_POS_TOP 2
 #define TB_POS_LEFT 3
 #define TB_POS_RIGHT 4
-void PopupMenuAdjustCoordinatesAndFlags(int* x, int* y, UINT* uFlags)
-{
-    POINT pt;
-    GetCursorPos(&pt);
-    RECT rc;
-    UINT tbPos = GetTaskbarLocationAndSize(pt, &rc);
-    if (tbPos == TB_POS_BOTTOM)
-    {
-        *y = MIN(*y, rc.top);
-        *uFlags |= TPM_CENTERALIGN | TPM_BOTTOMALIGN;
-    }
-    else if (tbPos == TB_POS_TOP)
-    {
-        *y = MAX(*y, rc.bottom);
-        *uFlags |= TPM_CENTERALIGN | TPM_TOPALIGN;
-    }
-    else if (tbPos == TB_POS_LEFT)
-    {
-        *x = MAX(*x, rc.right);
-        *uFlags |= TPM_VCENTERALIGN | TPM_LEFTALIGN;
-    }
-    if (tbPos == TB_POS_RIGHT)
-    {
-        *x = MIN(*x, rc.left);
-        *uFlags |= TPM_VCENTERALIGN | TPM_RIGHTALIGN;
-    }
-}
 UINT GetTaskbarLocationAndSize(POINT ptCursor, RECT* rc)
 {
     MONITORINFO mi;
@@ -3127,6 +3102,33 @@ UINT GetTaskbarLocationAndSize(POINT ptCursor, RECT* rc)
     }
     return TB_POS_NOWHERE;
 }
+void PopupMenuAdjustCoordinatesAndFlags(int* x, int* y, UINT* uFlags)
+{
+    POINT pt;
+    GetCursorPos(&pt);
+    RECT rc;
+    UINT tbPos = GetTaskbarLocationAndSize(pt, &rc);
+    if (tbPos == TB_POS_BOTTOM)
+    {
+        *y = MIN(*y, rc.top);
+        *uFlags |= TPM_CENTERALIGN | TPM_BOTTOMALIGN;
+    }
+    else if (tbPos == TB_POS_TOP)
+    {
+        *y = MAX(*y, rc.bottom);
+        *uFlags |= TPM_CENTERALIGN | TPM_TOPALIGN;
+    }
+    else if (tbPos == TB_POS_LEFT)
+    {
+        *x = MAX(*x, rc.right);
+        *uFlags |= TPM_VCENTERALIGN | TPM_LEFTALIGN;
+    }
+    if (tbPos == TB_POS_RIGHT)
+    {
+        *x = MIN(*x, rc.left);
+        *uFlags |= TPM_VCENTERALIGN | TPM_RIGHTALIGN;
+    }
+}
 INT64 OwnerDrawSubclassProc(
     _In_ HWND   hWnd,
     _In_ UINT   uMsg,
@@ -4131,7 +4133,7 @@ void ClockButton_ToggleFlyoutCallback(
     *((INT64*)params->TrayUIInstance + params->CLOCKBUTTON_OFFSET_IN_TRAYUI) = params->oldClockButtonInstance;
     free(params);
 }
-void InvokeClockFlyout()
+BOOL InvokeClockFlyout()
 {
     POINT ptCursor;
     GetCursorPos(&ptCursor);
@@ -4174,14 +4176,13 @@ void InvokeClockFlyout()
         }
         else if (ShouldShowLegacyClockExperience() == 2)
         {
-            ToggleNotificationsFlyout();
-            return 0;
+            return ToggleNotificationsFlyout();
         }
         // On the main monitor, the TrayUI component of CTray handles this
         // message and basically does a `ClockButton::ToggleFlyout`; that's
         // the only place in code where that is used, otherwise, clicking and
         // dismissing the clock flyout probably involves 2 separate methods
-        PostMessageW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0);
+        return PostMessageW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0);
     }
     else
     {
@@ -4227,8 +4228,7 @@ void InvokeClockFlyout()
             }
             else if (ShouldShowLegacyClockExperience() == 2)
             {
-                ToggleNotificationsFlyout();
-                return 0;
+                return ToggleNotificationsFlyout();
             }
             if (bOldTaskbar)
             {
@@ -4259,15 +4259,16 @@ void InvokeClockFlyout()
                     params->TrayUIInstance = TrayUIInstance;
                     params->CLOCKBUTTON_OFFSET_IN_TRAYUI = CLOCKBUTTON_OFFSET_IN_TRAYUI;
                     params->oldClockButtonInstance = oldClockButtonInstance;
-                    SendMessageCallbackW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0, ClockButton_ToggleFlyoutCallback, params);
+                    return SendMessageCallbackW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0, ClockButton_ToggleFlyoutCallback, params);
                 }
             }
             else
             {
-                PostMessageW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0);
+                return PostMessageW(hShellTray_Wnd, WM_TOGGLE_CLOCK_FLYOUT, 0, 0);
             }
         }
     }
+    return FALSE;
 }
 INT64 winrt_Windows_Internal_Shell_implementation_MeetAndChatManager_OnMessageHook(
     void* _this,
@@ -9844,21 +9845,26 @@ DWORD InjectBasicFunctions(BOOL bIsExplorer, BOOL bInstall)
 
 #ifdef _WIN64
     // As of writing, this function is never invoked with bInstall=TRUE, so we don't handle the case if it's false for now
-    RtlQueryFeatureConfigurationFunc = GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlQueryFeatureConfiguration");
-    int rv = -1;
-    if (RtlQueryFeatureConfigurationFunc)
+    if (bIsExplorerProcess)
     {
-        rv = funchook_prepare(
-            funchook,
-            (void**)&RtlQueryFeatureConfigurationFunc,
-            RtlQueryFeatureConfigurationHook
-        );
-    }
-    if (rv != 0)
-    {
-        printf("Failed to hook RtlQueryFeatureConfiguration(). rv = %d\n", rv);
+        RtlQueryFeatureConfigurationFunc = GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlQueryFeatureConfiguration");
+        int rv = -1;
+        if (RtlQueryFeatureConfigurationFunc)
+        {
+            rv = funchook_prepare(
+                funchook,
+                (void**)&RtlQueryFeatureConfigurationFunc,
+                RtlQueryFeatureConfigurationHook
+            );
+        }
+        if (rv != 0)
+        {
+            printf("Failed to hook RtlQueryFeatureConfiguration(). rv = %d\n", rv);
+        }
     }
 #endif
+
+    return 0;
 }
 
 
@@ -10959,20 +10965,25 @@ DWORD Inject(BOOL bIsExplorer)
         &symbols_PTRS,
         sizeof(symbols_addr)
     );
-    if (LoadSymbols(&symbols_PTRS, hModule))
+    LoadSymbolsResult loadSymbolsResult = LoadSymbols(&symbols_PTRS);
+    if (loadSymbolsResult.bSuccess)
     {
-        if (bEnableSymbolDownload)
+        if (NeedToDownloadSymbols(&loadSymbolsResult))
         {
-            printf("Attempting to download symbol data; for now, the program may have limited functionality.\n");
-            DownloadSymbolsParams* params = malloc(sizeof(DownloadSymbolsParams));
-            params->hModule = hModule;
-            params->bVerbose = FALSE;
-            CreateThread(0, 0, DownloadSymbols, params, 0, 0);
+            if (bEnableSymbolDownload)
+            {
+                printf("Attempting to download symbol data; for now, the program may have limited functionality.\n");
+                DownloadSymbolsParams* params = malloc(sizeof(DownloadSymbolsParams));
+                params->hModule = hModule;
+                params->bVerbose = FALSE;
+                params->loadResult = loadSymbolsResult;
+                CreateThread(0, 0, DownloadSymbols, params, 0, 0);
+            }
+        }
+        else
+        {
+            printf("Loaded symbols\n");
         }
-    }
-    else
-    {
-        printf("Loaded symbols\n");
     }
 
 
@@ -12052,14 +12063,14 @@ INT64 StartDocked_StartSizingFrame_StartSizingFrameHook(void* _this)
     if (hModule)
     {
         DWORD dwStatus = 0, dwSize = sizeof(DWORD);
-        FARPROC SHRegGetValueFromHKCUHKLMFunc = GetProcAddress(hModule, "SHRegGetValueFromHKCUHKLM");
+        t_SHRegGetValueFromHKCUHKLM SHRegGetValueFromHKCUHKLMFunc = GetProcAddress(hModule, "SHRegGetValueFromHKCUHKLM");
         if (!SHRegGetValueFromHKCUHKLMFunc || SHRegGetValueFromHKCUHKLMFunc(
             TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced"),
             TEXT("TaskbarAl"),
             SRRF_RT_REG_DWORD,
             NULL,
             &dwStatus,
-            (LPDWORD)(&dwSize)
+            &dwSize
         ) != ERROR_SUCCESS)
         {
             dwStatus = 0;
@@ -12757,7 +12768,7 @@ HRESULT WINAPI _DllCanUnloadNow()
     return S_FALSE;
 }
 
-void InjectStartMenu()
+DWORD InjectStartMenu()
 {
 #ifdef _WIN64
     funchook = funchook_create();
@@ -12858,56 +12869,56 @@ void InjectStartMenu()
     );
 
     int rv;
-    DWORD dwVal0 = 0x62254, dwVal1 = 0x188EBC, dwVal2 = 0x187120, dwVal3 = 0x3C10, dwVal4 = 0;
+    DWORD dwVal0 = 0, dwVal1 = 0, dwVal2 = 0, dwVal3 = 0, dwVal4 = 0;
 
     HMODULE hModule = LoadLibraryW(L"Shlwapi.dll");
     if (hModule)
     {
         DWORD dwStatus = 0, dwSize = sizeof(DWORD);
-        FARPROC SHRegGetValueFromHKCUHKLMFunc = GetProcAddress(hModule, "SHRegGetValueFromHKCUHKLM");
+        t_SHRegGetValueFromHKCUHKLM SHRegGetValueFromHKCUHKLM = GetProcAddress(hModule, "SHRegGetValueFromHKCUHKLM");
 
-        if (SHRegGetValueFromHKCUHKLMFunc)
+        if (SHRegGetValueFromHKCUHKLM)
         {
             dwSize = sizeof(DWORD);
-            SHRegGetValueFromHKCUHKLMFunc(
+            SHRegGetValueFromHKCUHKLM(
                 TEXT(REGPATH_STARTMENU) TEXT("\\") TEXT(STARTDOCKED_SB_NAME),
                 TEXT(STARTDOCKED_SB_0),
                 SRRF_RT_REG_DWORD,
                 NULL,
                 &dwVal0,
-                (LPDWORD)(&dwSize)
+                &dwSize
             );
-            SHRegGetValueFromHKCUHKLMFunc(
+            SHRegGetValueFromHKCUHKLM(
                 TEXT(REGPATH_STARTMENU) TEXT("\\") TEXT(STARTDOCKED_SB_NAME),
                 TEXT(STARTDOCKED_SB_1),
                 SRRF_RT_REG_DWORD,
                 NULL,
                 &dwVal1,
-                (LPDWORD)(&dwSize)
+                &dwSize
             );
-            SHRegGetValueFromHKCUHKLMFunc(
+            SHRegGetValueFromHKCUHKLM(
                 TEXT(REGPATH_STARTMENU) TEXT("\\") TEXT(STARTDOCKED_SB_NAME),
                 TEXT(STARTDOCKED_SB_2),
                 SRRF_RT_REG_DWORD,
                 NULL,
                 &dwVal2,
-                (LPDWORD)(&dwSize)
+                &dwSize
             );
-            SHRegGetValueFromHKCUHKLMFunc(
+            SHRegGetValueFromHKCUHKLM(
                 TEXT(REGPATH_STARTMENU) TEXT("\\") TEXT(STARTDOCKED_SB_NAME),
                 TEXT(STARTDOCKED_SB_3),
                 SRRF_RT_REG_DWORD,
                 NULL,
                 &dwVal3,
-                (LPDWORD)(&dwSize)
+                &dwSize
             );
-            SHRegGetValueFromHKCUHKLMFunc(
+            SHRegGetValueFromHKCUHKLM(
                 TEXT(REGPATH_STARTMENU) TEXT("\\") TEXT(STARTUI_SB_NAME),
                 TEXT(STARTUI_SB_0),
                 SRRF_RT_REG_DWORD,
                 NULL,
                 &dwVal4,
-                (LPDWORD)(&dwSize)
+                &dwSize
             );
         }
         FreeLibrary(hModule);
@@ -12971,6 +12982,7 @@ void InjectStartMenu()
         return rv;
     }
 #endif
+    return 0;
 }
 
 void InjectShellExperienceHost()
diff --git a/ExplorerPatcher/symbols.c b/ExplorerPatcher/symbols.c
index 03146d9..7389af5 100644
--- a/ExplorerPatcher/symbols.c
+++ b/ExplorerPatcher/symbols.c
@@ -61,15 +61,293 @@ L"	</visual>\r\n"
 L"	<audio src=\"ms-winsoundevent:Notification.Default\" loop=\"false\" silent=\"false\"/>\r\n"
 L"</toast>\r\n";
 
-DWORD DownloadSymbols(DownloadSymbolsParams* params)
+extern INT VnDownloadSymbols(HMODULE hModule, char* dllName, char* szLibPath, UINT sizeLibPath);
+extern INT VnGetSymbols(const char* pdb_file, DWORD* addresses, char** symbols, DWORD numOfSymbols);
+
+static BOOL ProcessTwinuiPcshellSymbols(const char* pszSettingsPath, DWORD* pOffsets)
 {
     HKEY hKey = NULL;
     DWORD dwDisposition;
-    WCHAR hash[100];
+    RegCreateKeyExW(
+        HKEY_CURRENT_USER,
+        TEXT(REGPATH) L"\\" TEXT(TWINUI_PCSHELL_SB_NAME),
+        0,
+        NULL,
+        REG_OPTION_NON_VOLATILE,
+        KEY_WRITE,
+        NULL,
+        &hKey,
+        &dwDisposition
+    );
+    if (!hKey || hKey == INVALID_HANDLE_VALUE)
+    {
+        printf("[Symbols] Unable to create registry key.\n");
+        return FALSE;
+    }
+
+    DWORD dwZero = 0;
+    CHAR szHash[100];
     WCHAR wszPath[MAX_PATH];
 
-    HMODULE hModule = params->hModule;
+    ZeroMemory(szHash, sizeof(szHash));
+    ZeroMemory(wszPath, sizeof(wszPath));
 
+    char twinui_pcshell_sb_dll[MAX_PATH];
+    ZeroMemory(twinui_pcshell_sb_dll, sizeof(twinui_pcshell_sb_dll));
+    GetSystemDirectoryA(twinui_pcshell_sb_dll, MAX_PATH);
+    strcat_s(twinui_pcshell_sb_dll, MAX_PATH, "\\");
+    strcat_s(twinui_pcshell_sb_dll, MAX_PATH, TWINUI_PCSHELL_SB_NAME);
+    strcat_s(twinui_pcshell_sb_dll, MAX_PATH, ".dll");
+
+    GetSystemDirectoryW(wszPath, MAX_PATH);
+    wcscat_s(wszPath, MAX_PATH, L"\\" _T(TWINUI_PCSHELL_SB_NAME) L".dll");
+    ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash));
+
+    printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", twinui_pcshell_sb_dll, szHash);
+    if (VnDownloadSymbols(
+        NULL,
+        twinui_pcshell_sb_dll,
+        pszSettingsPath,
+        MAX_PATH
+    ))
+    {
+        printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", twinui_pcshell_sb_dll);
+        printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
+        if (hKey) RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    printf("[Symbols] Reading symbols...\n");
+    if (!IsWindows11())
+    {
+        DWORD flOldProtect = 0;
+        if (VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), PAGE_EXECUTE_READWRITE, &flOldProtect))
+        {
+            twinui_pcshell_SN[1] = twinui_pcshell_SN[0];
+            VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), flOldProtect, &flOldProtect);
+        }
+    }
+    if (IsWindows11Version22H2OrHigher())
+    {
+        DWORD flOldProtect = 0;
+        if (VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), PAGE_EXECUTE_READWRITE, &flOldProtect))
+        {
+            twinui_pcshell_SN[7] = "CMultitaskingViewManager::_CreateXamlMTVHost";
+            twinui_pcshell_SN[TWINUI_PCSHELL_SB_CNT - 1] = "CMultitaskingViewManager::_CreateDCompMTVHost";
+            VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), flOldProtect, &flOldProtect);
+        }
+    }
+    if (VnGetSymbols(
+        pszSettingsPath,
+        pOffsets,
+        twinui_pcshell_SN,
+        IsWindows11() ? TWINUI_PCSHELL_SB_CNT : 4
+    ))
+    {
+        if (!IsWindows11())
+        {
+            printf("[Symbols] Failure in reading symbols for \"%s\".\n", twinui_pcshell_sb_dll);
+            if (hKey) RegCloseKey(hKey);
+            return FALSE;
+        }
+
+        //printf("[Symbols] Hooking Win+C is not available in this build.\n");
+        RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_8), 0, REG_DWORD, &dwZero, sizeof(DWORD));
+        if (VnGetSymbols(
+            pszSettingsPath,
+            pOffsets,
+            twinui_pcshell_SN,
+            TWINUI_PCSHELL_SB_CNT - 1
+        ))
+        {
+            printf("[Symbols] Windows 10 window switcher style may not be available in this build.\n");
+            RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_7), 0, REG_DWORD, &dwZero, sizeof(DWORD));
+            if (VnGetSymbols(
+                pszSettingsPath,
+                pOffsets,
+                twinui_pcshell_SN,
+                TWINUI_PCSHELL_SB_CNT - 2
+            ))
+            {
+                printf("[Symbols] Failure in reading symbols for \"%s\".\n", twinui_pcshell_sb_dll);
+                if (hKey) RegCloseKey(hKey);
+                return FALSE;
+            }
+        }
+    }
+
+    if (!IsWindows11())
+    {
+        pOffsets[1] = 0;
+    }
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_0), 0, REG_DWORD, &pOffsets[0], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_1), 0, REG_DWORD, &pOffsets[1], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_2), 0, REG_DWORD, &pOffsets[2], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_3), 0, REG_DWORD, &pOffsets[3], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_4), 0, REG_DWORD, &pOffsets[4], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_5), 0, REG_DWORD, &pOffsets[5], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_6), 0, REG_DWORD, &pOffsets[6], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_7), 0, REG_DWORD, &pOffsets[7], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_8), 0, REG_DWORD, &pOffsets[8], sizeof(DWORD));
+
+    RegSetValueExA(hKey, "Hash", 0, REG_SZ, szHash, strlen(szHash) + 1);
+
+    if (hKey) RegCloseKey(hKey);
+    return TRUE;
+}
+
+static BOOL ProcessStartDockedSymbols(const char* pszSettingsPath, DWORD* pOffsets)
+{
+    HKEY hKey = NULL;
+    DWORD dwDisposition;
+    RegCreateKeyExW(
+        HKEY_CURRENT_USER,
+        TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME),
+        0,
+        NULL,
+        REG_OPTION_NON_VOLATILE,
+        KEY_WRITE,
+        NULL,
+        &hKey,
+        &dwDisposition
+    );
+    if (!hKey || hKey == INVALID_HANDLE_VALUE)
+    {
+        printf("[Symbols] Unable to create registry key.\n");
+        return FALSE;
+    }
+
+    CHAR szHash[100];
+    WCHAR wszPath[MAX_PATH];
+
+    ZeroMemory(szHash, sizeof(szHash));
+    ZeroMemory(wszPath, sizeof(wszPath));
+
+    char startdocked_sb_dll[MAX_PATH];
+    ZeroMemory(startdocked_sb_dll, sizeof(startdocked_sb_dll));
+    GetWindowsDirectoryA(startdocked_sb_dll, MAX_PATH);
+    strcat_s(startdocked_sb_dll, MAX_PATH, "\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\");
+    strcat_s(startdocked_sb_dll, MAX_PATH, STARTDOCKED_SB_NAME);
+    strcat_s(startdocked_sb_dll, MAX_PATH, ".dll");
+
+    GetWindowsDirectoryW(wszPath, MAX_PATH);
+    wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" _T(STARTDOCKED_SB_NAME) L".dll");
+    ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash));
+
+    printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", startdocked_sb_dll, szHash);
+    if (VnDownloadSymbols(
+        NULL,
+        startdocked_sb_dll,
+        pszSettingsPath,
+        MAX_PATH
+    ))
+    {
+        printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", startdocked_sb_dll);
+        printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
+        if (hKey) RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    printf("[Symbols] Reading symbols...\n");
+    if (VnGetSymbols(
+        pszSettingsPath,
+        pOffsets,
+        startdocked_SN,
+        STARTDOCKED_SB_CNT
+    ))
+    {
+        printf("[Symbols] Failure in reading symbols for \"%s\".\n", startdocked_sb_dll);
+        if (hKey) RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    RegSetValueExW(hKey, TEXT(STARTDOCKED_SB_0), 0, REG_DWORD, &pOffsets[0], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(STARTDOCKED_SB_1), 0, REG_DWORD, &pOffsets[1], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(STARTDOCKED_SB_2), 0, REG_DWORD, &pOffsets[2], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(STARTDOCKED_SB_3), 0, REG_DWORD, &pOffsets[3], sizeof(DWORD));
+    RegSetValueExW(hKey, TEXT(STARTDOCKED_SB_4), 0, REG_DWORD, &pOffsets[4], sizeof(DWORD));
+
+    RegSetValueExA(hKey, "Hash", 0, REG_SZ, szHash, strlen(szHash) + 1);
+
+    if (hKey) RegCloseKey(hKey);
+    return TRUE;
+}
+
+static BOOL ProcessStartUISymbols(const char* pszSettingsPath, DWORD* pOffsets)
+{
+    HKEY hKey = NULL;
+    DWORD dwDisposition;
+    RegCreateKeyExW(
+        HKEY_CURRENT_USER,
+        TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME),
+        0,
+        NULL,
+        REG_OPTION_NON_VOLATILE,
+        KEY_WRITE,
+        NULL,
+        &hKey,
+        &dwDisposition
+    );
+    if (!hKey || hKey == INVALID_HANDLE_VALUE)
+    {
+        printf("[Symbols] Unable to create registry key.\n");
+        return FALSE;
+    }
+
+    CHAR szHash[100];
+    WCHAR wszPath[MAX_PATH];
+
+    ZeroMemory(szHash, sizeof(szHash));
+    ZeroMemory(wszPath, sizeof(wszPath));
+
+    char startui_sb_dll[MAX_PATH];
+    ZeroMemory(startui_sb_dll, sizeof(startui_sb_dll));
+    GetWindowsDirectoryA(startui_sb_dll, MAX_PATH);
+    strcat_s(startui_sb_dll, MAX_PATH, "\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\");
+    strcat_s(startui_sb_dll, MAX_PATH, STARTUI_SB_NAME);
+    strcat_s(startui_sb_dll, MAX_PATH, ".dll");
+
+    GetWindowsDirectoryW(wszPath, MAX_PATH);
+    wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" _T(STARTUI_SB_NAME) L".dll");
+    ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash));
+
+    printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", startui_sb_dll, szHash);
+    if (VnDownloadSymbols(
+        NULL,
+        startui_sb_dll,
+        pszSettingsPath,
+        MAX_PATH
+    ))
+    {
+        printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", startui_sb_dll);
+        printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
+        if (hKey) RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    printf("[Symbols] Reading symbols...\n");
+    if (VnGetSymbols(
+        pszSettingsPath,
+        pOffsets,
+        startui_SN,
+        STARTUI_SB_CNT
+    ))
+    {
+        printf("[Symbols] Failure in reading symbols for \"%s\".\n", startui_sb_dll);
+        if (hKey) RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    RegSetValueExW(hKey, TEXT(STARTUI_SB_0), 0, REG_DWORD, &pOffsets[0], sizeof(DWORD));
+
+    RegSetValueExA(hKey, "Hash", 0, REG_SZ, szHash, strlen(szHash) + 1);
+
+    if (hKey) RegCloseKey(hKey);
+    return TRUE;
+}
+
+DWORD DownloadSymbols(DownloadSymbolsParams* params)
+{
     Sleep(6000);
 
     printf("[Symbols] Started \"Download symbols\" thread.\n");
@@ -79,7 +357,7 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
     TCHAR szReportedVersion[MAX_PATH + 1];
     ZeroMemory(
         szReportedVersion,
-        (MAX_PATH + 1) * sizeof(TCHAR)
+        sizeof(szReportedVersion)
     );
     wsprintf(
         szReportedVersion,
@@ -127,15 +405,14 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
     }
     wprintf(
         L"[Symbols] "
-        L"Attempting to download symbols for unknown OS version %s.\n",
+        L"Attempting to download symbols for OS version %s.\n",
         szReportedVersion
     );
 
-
     char szSettingsPath[MAX_PATH];
     ZeroMemory(
         szSettingsPath,
-        MAX_PATH * sizeof(char)
+        sizeof(szSettingsPath)
     );
     SHGetFolderPathA(
         NULL,
@@ -158,1101 +435,110 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
     printf("[Symbols] Downloading to \"%s\".\n", szSettingsPath);
 
     symbols_addr symbols_PTRS;
-    ZeroMemory(
-        &symbols_PTRS,
-        sizeof(symbols_addr)
-    );
-
-
-
-
-    ZeroMemory(hash, sizeof(WCHAR) * 100);
-    ZeroMemory(wszPath, sizeof(WCHAR) * 100);
-    char twinui_pcshell_sb_dll[MAX_PATH];
-    ZeroMemory(
-        twinui_pcshell_sb_dll,
-        (MAX_PATH) * sizeof(char)
-    );
-    GetSystemDirectoryA(
-        twinui_pcshell_sb_dll,
-        MAX_PATH
-    );
-    strcat_s(
-        twinui_pcshell_sb_dll,
-        MAX_PATH,
-        "\\"
-    );
-    strcat_s(
-        twinui_pcshell_sb_dll,
-        MAX_PATH,
-        TWINUI_PCSHELL_SB_NAME
-    );
-    strcat_s(
-        twinui_pcshell_sb_dll,
-        MAX_PATH,
-        ".dll"
-    );
-    RegCreateKeyExW(
-        HKEY_CURRENT_USER,
-        TEXT(REGPATH) L"\\" TEXT(TWINUI_PCSHELL_SB_NAME),
-        0,
-        NULL,
-        REG_OPTION_NON_VOLATILE,
-        KEY_WRITE,
-        NULL,
-        &hKey,
-        &dwDisposition
-    );
-    if (!hKey || hKey == INVALID_HANDLE_VALUE)
+    ZeroMemory(&symbols_PTRS, sizeof(symbols_addr));
+    BOOL bDownloaded = FALSE;
+    if (params->loadResult.bNeedToDownloadTwinuiPcshellSymbols)
     {
-        if (params->bVerbose)
-        {
-            FreeLibraryAndExitThread(
-                hModule,
-                9
-            );
-        }
-        return 9;
+        bDownloaded |= ProcessTwinuiPcshellSymbols(szSettingsPath, symbols_PTRS.twinui_pcshell_PTRS);
     }
-    GetSystemDirectoryW(wszPath, MAX_PATH);
-    wcscat_s(wszPath, MAX_PATH, L"\\" _T(TWINUI_PCSHELL_SB_NAME) L".dll");
-    ComputeFileHash(wszPath, hash, 100);
-    printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", twinui_pcshell_sb_dll, hash);
-    if (VnDownloadSymbols(
-        NULL,
-        twinui_pcshell_sb_dll,
-        szSettingsPath,
-        MAX_PATH
-    ))
+    if (params->loadResult.bNeedToDownloadStartDockedSymbols && IsWindows11())
     {
-        printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", twinui_pcshell_sb_dll);
-        printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
-        if (params->bVerbose)
-        {
-            FreeLibraryAndExitThread(
-                hModule,
-                4
-            );
-        }
-        return 4;
+        bDownloaded |= ProcessStartDockedSymbols(szSettingsPath, symbols_PTRS.startdocked_PTRS);
     }
-    printf("[Symbols] Reading symbols...\n");
-    if (!IsWindows11())
+    if (params->loadResult.bNeedToDownloadStartUISymbols && rovi.dwBuildNumber >= 18362)
     {
-        DWORD flOldProtect = 0;
-        if (VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), PAGE_EXECUTE_READWRITE, &flOldProtect))
-        {
-            twinui_pcshell_SN[1] = twinui_pcshell_SN[0];
-            VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), flOldProtect, &flOldProtect);
-        }
+        bDownloaded |= ProcessStartUISymbols(szSettingsPath, symbols_PTRS.startui_PTRS);
     }
-    if (IsWindows11Version22H2OrHigher())
-    {
-        DWORD flOldProtect = 0;
-        if (VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), PAGE_EXECUTE_READWRITE, &flOldProtect))
-        {
-            twinui_pcshell_SN[7] = "CMultitaskingViewManager::_CreateXamlMTVHost";
-            twinui_pcshell_SN[TWINUI_PCSHELL_SB_CNT - 1] = "CMultitaskingViewManager::_CreateDCompMTVHost";
-            VirtualProtect(twinui_pcshell_SN, sizeof(twinui_pcshell_SN), flOldProtect, &flOldProtect);
-        }
-    }
-    if (VnGetSymbols(
-        szSettingsPath,
-        symbols_PTRS.twinui_pcshell_PTRS,
-        twinui_pcshell_SN,
-        IsWindows11() ? TWINUI_PCSHELL_SB_CNT : 4
-    ))
-    {
-        if (IsWindows11())
-        {
-            //printf("[Symbols] Hooking Win+C is not available in this build.\n");
-            DWORD dwZero = 0;
-            RegSetValueExW(
-                hKey,
-                TEXT(TWINUI_PCSHELL_SB_8),
-                0,
-                REG_DWORD,
-                &dwZero,
-                sizeof(DWORD)
-            );
-            if (VnGetSymbols(
-                szSettingsPath,
-                symbols_PTRS.twinui_pcshell_PTRS,
-                twinui_pcshell_SN,
-                TWINUI_PCSHELL_SB_CNT - 1
-            ))
-            {
-                printf("[Symbols] Windows 10 window switcher style is not available in this build.\n");
-                DWORD dwZero = 0;
-                RegSetValueExW(
-                    hKey,
-                    TEXT(TWINUI_PCSHELL_SB_7),
-                    0,
-                    REG_DWORD,
-                    &dwZero,
-                    sizeof(DWORD)
-                );
-                if (VnGetSymbols(
-                    szSettingsPath,
-                    symbols_PTRS.twinui_pcshell_PTRS,
-                    twinui_pcshell_SN,
-                    TWINUI_PCSHELL_SB_CNT - 2
-                ))
-                {
-                    printf("[Symbols] Failure in reading symbols for \"%s\".\n", twinui_pcshell_sb_dll);
-                    if (params->bVerbose)
-                    {
-                        FreeLibraryAndExitThread(
-                            hModule,
-                            5
-                        );
-                    }
-                    return 5;
-                }
-            }
-        }
-        else
-        {
-            printf("[Symbols] Failure in reading symbols for \"%s\".\n", twinui_pcshell_sb_dll);
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    5
-                );
-            }
-            return 5;
-        }
-    }
-    if (!IsWindows11())
-    {
-        symbols_PTRS.twinui_pcshell_PTRS[1] = 0;
-    }
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_0),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[0]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_1),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[1]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_2),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[2]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_3),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[3]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_4),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[4]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_5),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[5]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_6),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[6]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_7),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[7]),
-        sizeof(DWORD)
-    );
-    RegSetValueExW(
-        hKey,
-        TEXT(TWINUI_PCSHELL_SB_8),
-        0,
-        REG_DWORD,
-        &(symbols_PTRS.twinui_pcshell_PTRS[8]),
-        sizeof(DWORD)
-    );
-    if (hKey) RegCloseKey(hKey);
-
-
-
-    if (IsWindows11())
-    {
-        ZeroMemory(hash, sizeof(WCHAR) * 100);
-        ZeroMemory(wszPath, sizeof(WCHAR) * 100);
-        char startdocked_sb_dll[MAX_PATH];
-        ZeroMemory(
-            startdocked_sb_dll,
-            (MAX_PATH) * sizeof(char)
-        );
-        GetWindowsDirectoryA(
-            startdocked_sb_dll,
-            MAX_PATH
-        );
-        strcat_s(
-            startdocked_sb_dll,
-            MAX_PATH,
-            "\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\"
-        );
-        strcat_s(
-            startdocked_sb_dll,
-            MAX_PATH,
-            STARTDOCKED_SB_NAME
-        );
-        strcat_s(
-            startdocked_sb_dll,
-            MAX_PATH,
-            ".dll"
-        );
-        GetWindowsDirectoryW(wszPath, MAX_PATH);
-        wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" _T(STARTDOCKED_SB_NAME) L".dll");
-        ComputeFileHash(wszPath, hash, 100);
-        printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", startdocked_sb_dll, hash);
-        if (VnDownloadSymbols(
-            NULL,
-            startdocked_sb_dll,
-            szSettingsPath,
-            MAX_PATH
-        ))
-        {
-            printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", startdocked_sb_dll);
-            printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    6
-                );
-            }
-            return 6;
-        }
-        printf("[Symbols] Reading symbols...\n");
-        if (VnGetSymbols(
-            szSettingsPath,
-            symbols_PTRS.startdocked_PTRS,
-            startdocked_SN,
-            STARTDOCKED_SB_CNT
-        ))
-        {
-            printf("[Symbols] Failure in reading symbols for \"%s\".\n", startdocked_sb_dll);
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    7
-                );
-            }
-            return 7;
-        }
-        RegCreateKeyExW(
-            HKEY_CURRENT_USER,
-            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME),
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_WRITE,
-            NULL,
-            &hKey,
-            &dwDisposition
-        );
-        if (!hKey || hKey == INVALID_HANDLE_VALUE)
-        {
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    8
-                );
-            }
-            return 8;
-        }
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTDOCKED_SB_0),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startdocked_PTRS[0]),
-            sizeof(DWORD)
-        );
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTDOCKED_SB_1),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startdocked_PTRS[1]),
-            sizeof(DWORD)
-        );
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTDOCKED_SB_2),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startdocked_PTRS[2]),
-            sizeof(DWORD)
-        );
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTDOCKED_SB_3),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startdocked_PTRS[3]),
-            sizeof(DWORD)
-        );
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTDOCKED_SB_4),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startdocked_PTRS[4]),
-            sizeof(DWORD)
-        );
-        if (hKey) RegCloseKey(hKey);
-    }
-
-
-
-
-    if (rovi.dwBuildNumber >= 18362)
-    {
-        ZeroMemory(hash, sizeof(WCHAR) * 100);
-        ZeroMemory(wszPath, sizeof(WCHAR) * 100);
-        char startui_sb_dll[MAX_PATH];
-        ZeroMemory(
-            startui_sb_dll,
-            (MAX_PATH) * sizeof(char)
-        );
-        GetWindowsDirectoryA(
-            startui_sb_dll,
-            MAX_PATH
-        );
-        strcat_s(
-            startui_sb_dll,
-            MAX_PATH,
-            "\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\"
-        );
-        strcat_s(
-            startui_sb_dll,
-            MAX_PATH,
-            STARTUI_SB_NAME
-        );
-        strcat_s(
-            startui_sb_dll,
-            MAX_PATH,
-            ".dll"
-        );
-        GetWindowsDirectoryW(wszPath, MAX_PATH);
-        wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" _T(STARTUI_SB_NAME) L".dll");
-        ComputeFileHash(wszPath, hash, 100);
-        printf("[Symbols] Downloading symbols for \"%s\" (\"%s\")...\n", startui_sb_dll, hash);
-        if (VnDownloadSymbols(
-            NULL,
-            startui_sb_dll,
-            szSettingsPath,
-            MAX_PATH
-        ))
-        {
-            printf("[Symbols] Symbols for \"%s\" are not available - unable to download.\n", startui_sb_dll);
-            printf("[Symbols] Please refer to \"https://github.com/valinet/ExplorerPatcher/wiki/Symbols\" for more information.\n");
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    6
-                );
-            }
-            return 6;
-        }
-        printf("[Symbols] Reading symbols...\n");
-        if (VnGetSymbols(
-            szSettingsPath,
-            symbols_PTRS.startui_PTRS,
-            startui_SN,
-            STARTUI_SB_CNT
-        ))
-        {
-            printf("[Symbols] Failure in reading symbols for \"%s\".\n", startui_sb_dll);
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    7
-                );
-            }
-            return 7;
-        }
-        RegCreateKeyExW(
-            HKEY_CURRENT_USER,
-            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME),
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_WRITE,
-            NULL,
-            &hKey,
-            &dwDisposition
-        );
-        if (!hKey || hKey == INVALID_HANDLE_VALUE)
-        {
-            if (params->bVerbose)
-            {
-                FreeLibraryAndExitThread(
-                    hModule,
-                    8
-                );
-            }
-            return 8;
-        }
-        RegSetValueExW(
-            hKey,
-            TEXT(STARTUI_SB_0),
-            0,
-            REG_DWORD,
-            &(symbols_PTRS.startui_PTRS[0]),
-            sizeof(DWORD)
-        );
-        if (hKey) RegCloseKey(hKey);
-    }
-
-
-
-
-
-
-
-    RegCreateKeyExW(
-        HKEY_CURRENT_USER,
-        TEXT(REGPATH),
-        0,
-        NULL,
-        REG_OPTION_NON_VOLATILE,
-        KEY_WRITE,
-        NULL,
-        &hKey,
-        &dwDisposition
-    );
-    if (!hKey || hKey == INVALID_HANDLE_VALUE)
-    {
-        if (params->bVerbose)
-        {
-            FreeLibraryAndExitThread(
-                hModule,
-                10
-            );
-        }
-        return 10;
-    }
-    RegSetValueExW(
-        hKey,
-        TEXT("OSBuild"),
-        0,
-        REG_SZ,
-        szReportedVersion,
-        wcslen(szReportedVersion) * sizeof(TCHAR)
-    );
-    if (hKey) RegCloseKey(hKey);
-
 
     printf("[Symbols] Finished gathering symbol data.\n");
 
-    if (params->bVerbose)
+    if (bDownloaded)
     {
-        __x_ABI_CWindows_CData_CXml_CDom_CIXmlDocument* inputXml = NULL;
-        HRESULT hr = String2IXMLDocument(
-            InstallOK,
-            wcslen(InstallOK),
-            &inputXml,
+        if (params->bVerbose)
+        {
+            __x_ABI_CWindows_CData_CXml_CDom_CIXmlDocument* inputXml = NULL;
+            HRESULT hr = String2IXMLDocument(
+                InstallOK,
+                wcslen(InstallOK),
+                &inputXml,
 #ifdef DEBUG
-            stdout
+                stdout
 #else
-            NULL
+                NULL
 #endif
-        );
-        hr = ShowToastMessage(
-            inputXml,
-            APPID,
-            sizeof(APPID) / sizeof(TCHAR) - 1,
+            );
+            hr = ShowToastMessage(
+                inputXml,
+                APPID,
+                sizeof(APPID) / sizeof(TCHAR) - 1,
 #ifdef DEBUG
-            stdout
+                stdout
 #else
-            NULL
+                NULL
 #endif
-        );
-        Sleep(4000);
-        exit(0);
-    }
-    else
-    {
-        wsprintf(
-            buffer,
-            DownloadOKXML,
-            szReportedVersion
-        );
-        __x_ABI_CWindows_CData_CXml_CDom_CIXmlDocument* inputXml2 = NULL;
-        HRESULT hr = String2IXMLDocument(
-            buffer,
-            wcslen(buffer),
-            &inputXml2,
+            );
+            Sleep(4000);
+            exit(0);
+        }
+        else
+        {
+            wsprintf(
+                buffer,
+                DownloadOKXML,
+                szReportedVersion
+            );
+            __x_ABI_CWindows_CData_CXml_CDom_CIXmlDocument* inputXml2 = NULL;
+            HRESULT hr = String2IXMLDocument(
+                buffer,
+                wcslen(buffer),
+                &inputXml2,
 #ifdef DEBUG
-            stdout
+                stdout
 #else
-            NULL
+                NULL
 #endif
-        );
-        hr = ShowToastMessage(
-            inputXml2,
-            APPID,
-            sizeof(APPID) / sizeof(TCHAR) - 1,
+            );
+            hr = ShowToastMessage(
+                inputXml2,
+                APPID,
+                sizeof(APPID) / sizeof(TCHAR) - 1,
 #ifdef DEBUG
-            stdout
+                stdout
 #else
-            NULL
+                NULL
 #endif
-        );
+            );
+        }
     }
 
     printf("[Symbols] Finished \"Download symbols\" thread.\n");
+    return 0;
 }
 
-BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule)
+LoadSymbolsResult LoadSymbols(symbols_addr* symbols_PTRS)
 {
+    LoadSymbolsResult result;
+    ZeroMemory(&result, sizeof(LoadSymbolsResult));
+
     HKEY hKey = NULL;
     DWORD dwDisposition;
-    DWORD dwSize = sizeof(DWORD);
+    DWORD dwSize;
 
     RTL_OSVERSIONINFOW rovi;
     DWORD32 ubr = VnGetOSVersionAndUBR(&rovi);
-    TCHAR szReportedVersion[MAX_PATH + 1];
-    ZeroMemory(
-        szReportedVersion,
-        (MAX_PATH + 1) * sizeof(TCHAR)
-    );
-    TCHAR szStoredVersion[MAX_PATH + 1];
-    ZeroMemory(
-        szStoredVersion,
-        (MAX_PATH + 1) * sizeof(TCHAR)
-    );
-    wsprintf(
-        szReportedVersion,
-        L"%d.%d.%d.%d",
-        rovi.dwMajorVersion,
-        rovi.dwMinorVersion,
-        rovi.dwBuildNumber,
-        ubr
-    );
 
-    BOOL bIsStartHardcoded = FALSE;
-    BOOL bIsTwinuiPcshellHardcoded = FALSE;
-    CHAR hash[100];
-    ZeroMemory(hash, 100 * sizeof(CHAR));
+    CHAR szHash[33];
+    CHAR szStoredHash[33];
+    ZeroMemory(szHash, sizeof(szHash));
+    ZeroMemory(szStoredHash, sizeof(szStoredHash));
     TCHAR wszPath[MAX_PATH];
+    BOOL bOffsetsValid;
 
-    GetSystemDirectoryW(wszPath, MAX_PATH);
-    wcscat_s(wszPath, MAX_PATH, L"\\" TEXT(TWINUI_PCSHELL_SB_NAME) L".dll");
-    ComputeFileHash(wszPath, hash, 100);
-    if (!_stricmp(hash, "8b23b02962856e89b8d8a3956de1d76c")) // 282, 318
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x217CE6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5CC570;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5F5E88;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5F6690;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5DAC08;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5DA8C4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5CD9C0;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5f744c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x52980;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "03487ccd5bc5a194fad61b616b0a2b28") || !_stricmp(hash, "3f6ef12a59a2f84a3296771ea7753e01")) // 346, 348, 376, 434, 438
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x21B036;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5CD740;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5F7058;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5F7860;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5DBDD8;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5DBA94;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5CEB90;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5f861c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x4D780;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "6399b5913a7048c4422e3cfb03860da2") || !_stricmp(hash, "99dea5939a2b1945b2d3fd65433ca401")) // 466, 469
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x229fa6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5dc500;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5fa868;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5fb070;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5df640;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5df2f4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5dd910;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5fbe2c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x5dd910;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "5cd249a3b9cc1f1a6c0e9e699fb8ab74")) // 527
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x22b3b6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5ddaf0;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5fbc08;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5fc410;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5e0c30;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5e08e4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5def00;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5fd1cc;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x4da10;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "2466E0F424DCDC3498CE0236F0911554")) // 556
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x22b776;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5ddeb0;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5fbfc8;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5fc7d0;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5e0ff0;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5e0ca4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5df2c0;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5fd58c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x4da10;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "068b6012bc825f178d3418870422871b")) // 613
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x227696;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5cd590;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5eb6d8;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5ebee0;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5d06d0;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5d0384;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5ce9a0;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5ecc9c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x3bc70;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "18ae53a66cb941f5bba8411a8f245e0c")) // 675
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x227fa6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5cd4b0;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5eb5f8;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5ebe00;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5d05f0;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5d02a4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5ce8c0;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5ecbbc;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x4a7e0;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "b6d42f3599df7caf5b0da775e725d963")) // 708
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x227cb6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5cd600;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5eb748;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5ebf50;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5d0740;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5d03f4;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5cea10;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5ecd0c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x4a7b0;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "93dbd7bfcb21d2449bc0eb10d6e3f6ab")) // 778
-    {
-        symbols_PTRS->twinui_pcshell_PTRS[0] = 0x2291b6;
-        symbols_PTRS->twinui_pcshell_PTRS[1] = 0x5ce700;
-        symbols_PTRS->twinui_pcshell_PTRS[2] = 0x5ec688;
-        symbols_PTRS->twinui_pcshell_PTRS[3] = 0x5ece90;
-        symbols_PTRS->twinui_pcshell_PTRS[4] = 0x5d1684;
-        symbols_PTRS->twinui_pcshell_PTRS[5] = 0x5d1338;
-        symbols_PTRS->twinui_pcshell_PTRS[6] = 0x5cf890;
-        symbols_PTRS->twinui_pcshell_PTRS[7] = 0x5edc4c;
-        symbols_PTRS->twinui_pcshell_PTRS[8] = 0x49de0;
-        bIsTwinuiPcshellHardcoded = TRUE;
-    }
-    if (bIsTwinuiPcshellHardcoded)
-    {
-        printf("[Symbols] Identified known \"" TWINUI_PCSHELL_SB_NAME ".dll\" with hash %s.\n", hash);
-    }
-
-    GetWindowsDirectoryW(wszPath, MAX_PATH);
-    wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" TEXT(STARTDOCKED_SB_NAME) L".dll");
-    ComputeFileHash(wszPath, hash, 100);
-    if (!_stricmp(hash, "b57bb94a48d2422de9a78c5fcba28f98")) // 282, 318
-    {
-        symbols_PTRS->startdocked_PTRS[0] = 0x188EBC;
-        symbols_PTRS->startdocked_PTRS[1] = 0x188EBC;
-        symbols_PTRS->startdocked_PTRS[2] = 0x187120;
-        symbols_PTRS->startdocked_PTRS[3] = 0x3C10;
-        symbols_PTRS->startdocked_PTRS[4] = 0x160AEC;
-        bIsStartHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "e9c1c45a659dafabf671cb0ae195f8d9") || !_stricmp(hash, "7e652d78661ba62e33d41ad1d3180344") || !_stricmp(hash, "72c07045d99ec3bf2cf4479aa324281a")) // 346, 348, 376, 434, 438, 466, 527, 556
-    {
-        symbols_PTRS->startdocked_PTRS[0] = 0x18969C;
-        symbols_PTRS->startdocked_PTRS[1] = 0x18969C;
-        symbols_PTRS->startdocked_PTRS[2] = 0x187900;
-        symbols_PTRS->startdocked_PTRS[3] = 0x3C00;
-        symbols_PTRS->startdocked_PTRS[4] = 0x1612CC;
-        bIsStartHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "45d43542e694713bffd217862721109a")) // 613
-    {
-        symbols_PTRS->startdocked_PTRS[0] = 0x18993c;
-        symbols_PTRS->startdocked_PTRS[1] = 0x18993c;
-        symbols_PTRS->startdocked_PTRS[2] = 0x187ba0;
-        symbols_PTRS->startdocked_PTRS[3] = 0x3c00;
-        symbols_PTRS->startdocked_PTRS[4] = 0x16156c;
-        bIsStartHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "7f6d03e316dfca4ee61a89b51b453d82") || !_stricmp(hash, "1b727beb3cafc0ce0e928ccfae4b8e8f")) // 675, 708
-    {
-        symbols_PTRS->startdocked_PTRS[0] = 0x189a7c;
-        symbols_PTRS->startdocked_PTRS[1] = 0x189a7c;
-        symbols_PTRS->startdocked_PTRS[2] = 0x187ce0;
-        symbols_PTRS->startdocked_PTRS[3] = 0x3c00;
-        symbols_PTRS->startdocked_PTRS[4] = 0x1616ac;
-        bIsStartHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "a7745c7fabca519e865a559bb7e13ed9")) // 778
-    {
-        symbols_PTRS->startdocked_PTRS[0] = 0x19a910;
-        symbols_PTRS->startdocked_PTRS[1] = 0x19a910;
-        symbols_PTRS->startdocked_PTRS[2] = 0x198a70;
-        symbols_PTRS->startdocked_PTRS[3] = 0x4480;
-        symbols_PTRS->startdocked_PTRS[4] = 0x170ddc;
-        bIsStartHardcoded = TRUE;
-    }
-    if (bIsStartHardcoded)
-    {
-        printf("[Symbols] Identified known \"" STARTDOCKED_SB_NAME ".dll\" with hash %s.\n", hash);
-
-        RegCreateKeyExW(
-            HKEY_CURRENT_USER,
-            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME),
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_WRITE,
-            NULL,
-            &hKey,
-            &dwDisposition
-        );
-        if (hKey)
-        {
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_0),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startdocked_PTRS[0]),
-                sizeof(DWORD)
-            );
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_1),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startdocked_PTRS[1]),
-                sizeof(DWORD)
-            );
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_2),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startdocked_PTRS[2]),
-                sizeof(DWORD)
-            );
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_3),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startdocked_PTRS[3]),
-                sizeof(DWORD)
-            );
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_4),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startdocked_PTRS[4]),
-                sizeof(DWORD)
-            );
-            RegCloseKey(hKey);
-        }
-    }
-    bIsStartHardcoded = FALSE;
-    GetWindowsDirectoryW(wszPath, MAX_PATH);
-    wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" TEXT(STARTUI_SB_NAME) L".dll");
-    ComputeFileHash(wszPath, hash, 100);
-    if (!_stricmp(hash, "2768cc6cc7f686b2aa084cb5c8cce65d") || !_stricmp(hash, "a7c82cb9a9fd6f87897fc8a737d6b4d7")) // 493, 527, 556, 613, 675
-    {
-        symbols_PTRS->startui_PTRS[0] = 0x37180;
-        bIsStartHardcoded = TRUE;
-    }
-    else if (!_stricmp(hash, "bab11b2d1dca6b167f313f4d54de2b7d") || !_stricmp(hash, "0c1b88f888d9073c505d7f47724132c8")) // 708, 778
-    {
-        symbols_PTRS->startui_PTRS[0] = 0x37120;
-        bIsStartHardcoded = TRUE;
-    }
-    if (bIsStartHardcoded)
-    {
-        printf("[Symbols] Identified known \"" STARTUI_SB_NAME ".dll\" with hash %s.\n", hash);
-
-        RegCreateKeyExW(
-            HKEY_CURRENT_USER,
-            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME),
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_WRITE,
-            NULL,
-            &hKey,
-            &dwDisposition
-        );
-        if (hKey)
-        {
-            RegSetValueExW(
-                hKey,
-                TEXT(STARTUI_SB_0),
-                0,
-                REG_DWORD,
-                &(symbols_PTRS->startui_PTRS[0]),
-                sizeof(DWORD)
-            );
-            RegCloseKey(hKey);
-        }
-    }
-    if (!bIsTwinuiPcshellHardcoded || !bIsStartHardcoded)
-    {
-        RegCreateKeyExW(
-            HKEY_CURRENT_USER,
-            TEXT(REGPATH) L"\\" TEXT(TWINUI_PCSHELL_SB_NAME),
-            0,
-            NULL,
-            REG_OPTION_NON_VOLATILE,
-            KEY_READ,
-            NULL,
-            &hKey,
-            &dwDisposition
-        );
-        if (!hKey || hKey == INVALID_HANDLE_VALUE)
-        {
-            FreeLibraryAndExitThread(
-                hModule,
-                1
-            );
-            return 1;
-        }
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_0),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[0]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_1),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[1]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_2),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[2]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_3),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[3]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_4),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[4]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_5),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[5]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_6),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[6]),
-            &dwSize
-        );
-        RegQueryValueExW(
-            hKey,
-            TEXT(TWINUI_PCSHELL_SB_7),
-            0,
-            NULL,
-            &(symbols_PTRS->twinui_pcshell_PTRS[7]),
-            &dwSize
-        );
-        if (IsWindows11Version22H2OrHigher())
-        {
-            RegQueryValueExW(
-                hKey,
-                TEXT(TWINUI_PCSHELL_SB_LAST),
-                0,
-                NULL,
-                &(symbols_PTRS->twinui_pcshell_PTRS[TWINUI_PCSHELL_SB_CNT - 1]),
-                &dwSize
-            );
-        }
-        RegCloseKey(hKey);
-
-        if (IsWindows11())
-        {
-            RegCreateKeyExW(
-                HKEY_CURRENT_USER,
-                TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME),
-                0,
-                NULL,
-                REG_OPTION_NON_VOLATILE,
-                KEY_READ,
-                NULL,
-                &hKey,
-                &dwDisposition
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_0),
-                0,
-                NULL,
-                &(symbols_PTRS->startdocked_PTRS[0]),
-                &dwSize
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_1),
-                0,
-                NULL,
-                &(symbols_PTRS->startdocked_PTRS[1]),
-                &dwSize
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_2),
-                0,
-                NULL,
-                &(symbols_PTRS->startdocked_PTRS[2]),
-                &dwSize
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_3),
-                0,
-                NULL,
-                &(symbols_PTRS->startdocked_PTRS[3]),
-                &dwSize
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTDOCKED_SB_4),
-                0,
-                NULL,
-                &(symbols_PTRS->startdocked_PTRS[4]),
-                &dwSize
-            );
-            if (hKey) RegCloseKey(hKey);
-        }
-
-        RTL_OSVERSIONINFOW rovi;
-        if (VnGetOSVersion(&rovi) && rovi.dwBuildNumber >= 18362)
-        {
-            RegCreateKeyExW(
-                HKEY_CURRENT_USER,
-                TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME),
-                0,
-                NULL,
-                REG_OPTION_NON_VOLATILE,
-                KEY_READ,
-                NULL,
-                &hKey,
-                &dwDisposition
-            );
-            RegQueryValueExW(
-                hKey,
-                TEXT(STARTUI_SB_0),
-                0,
-                NULL,
-                &(symbols_PTRS->startui_PTRS[0]),
-                &dwSize
-            );
-            if (hKey) RegCloseKey(hKey);
-        }
-    }
-
-    BOOL bNeedToDownload = FALSE;
-    if (IsWindows11())
-    {
-        for (UINT i = 0; i < sizeof(symbols_addr) / sizeof(DWORD); ++i)
-        {
-            if (!((DWORD*)symbols_PTRS)[i] &&
-                (((DWORD*)symbols_PTRS) + i) != symbols_PTRS->twinui_pcshell_PTRS + TWINUI_PCSHELL_SB_CNT - 1 &&
-                (((DWORD*)symbols_PTRS) + i) != symbols_PTRS->twinui_pcshell_PTRS + TWINUI_PCSHELL_SB_CNT - 2
-                )
-            {
-                bNeedToDownload = TRUE;
-            }
-        }
-    }
-    else
-    {
-        if (!symbols_PTRS->twinui_pcshell_PTRS[0] || !symbols_PTRS->twinui_pcshell_PTRS[2] || !symbols_PTRS->twinui_pcshell_PTRS[3])
-        {
-            bNeedToDownload = TRUE;
-        }
-    }
+    // Load twinui.pcshell.dll offsets
+    bOffsetsValid = FALSE;
     RegCreateKeyExW(
         HKEY_CURRENT_USER,
-        TEXT(REGPATH),
+        TEXT(REGPATH) L"\\" TEXT(TWINUI_PCSHELL_SB_NAME),
         0,
         NULL,
         REG_OPTION_NON_VOLATILE,
@@ -1261,26 +547,167 @@ BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule)
         &hKey,
         &dwDisposition
     );
-    dwSize = MAX_PATH;
-    RegQueryValueExW(
-        hKey,
-        TEXT("OSBuild"),
-        0,
-        NULL,
-        szStoredVersion,
-        &dwSize
-    );
-    RegCloseKey(hKey);
-    if (!bNeedToDownload && (!bIsTwinuiPcshellHardcoded || !bIsStartHardcoded))
+    if (!hKey || hKey == INVALID_HANDLE_VALUE)
     {
-        bNeedToDownload = wcscmp(szReportedVersion, szStoredVersion);
-        if (bNeedToDownload)
+        result.bSuccess = FALSE;
+        return result;
+    }
+
+    GetSystemDirectoryW(wszPath, MAX_PATH);
+    wcscat_s(wszPath, MAX_PATH, L"\\" TEXT(TWINUI_PCSHELL_SB_NAME) L".dll");
+    if (ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash)) == ERROR_SUCCESS)
+    {
+        szStoredHash[0] = 0;
+        dwSize = sizeof(szStoredHash);
+        RegQueryValueExA(hKey, "Hash", 0, NULL, szStoredHash, &dwSize);
+
+        if (!_stricmp(szHash, szStoredHash))
         {
-            ZeroMemory(
-                symbols_PTRS,
-                sizeof(symbols_addr)
+            dwSize = sizeof(DWORD);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_0), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[0], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_1), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[1], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_2), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[2], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_3), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[3], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_4), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[4], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_5), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[5], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_6), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[6], &dwSize);
+            RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_7), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[7], &dwSize);
+            if (IsWindows11Version22H2OrHigher())
+            {
+                RegQueryValueExW(hKey, TEXT(TWINUI_PCSHELL_SB_LAST), 0, NULL, &symbols_PTRS->twinui_pcshell_PTRS[TWINUI_PCSHELL_SB_CNT - 1], &dwSize);
+            }
+            bOffsetsValid = TRUE;
+        }
+        else
+        {
+            printf("[Symbols] Symbols for \"%s\" are not available.\n", TWINUI_PCSHELL_SB_NAME);
+            result.bNeedToDownloadTwinuiPcshellSymbols = TRUE;
+        }
+    }
+
+    RegCloseKey(hKey);
+    if (!bOffsetsValid)
+    {
+        RegDeleteTreeW(
+            HKEY_CURRENT_USER,
+            TEXT(REGPATH) L"\\" TEXT(TWINUI_PCSHELL_SB_NAME)
+        );
+    }
+
+    if (IsWindows11())
+    {
+        // Load StartDocked.dll offsets
+        bOffsetsValid = FALSE;
+        RegCreateKeyExW(
+            HKEY_CURRENT_USER,
+            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME),
+            0,
+            NULL,
+            REG_OPTION_NON_VOLATILE,
+            KEY_READ,
+            NULL,
+            &hKey,
+            &dwDisposition
+        );
+
+        GetWindowsDirectoryW(wszPath, MAX_PATH);
+        wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" TEXT(STARTDOCKED_SB_NAME) L".dll");
+        if (ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash)) == ERROR_SUCCESS)
+        {
+            szStoredHash[0] = 0;
+            dwSize = sizeof(szStoredHash);
+            RegQueryValueExA(hKey, "Hash", 0, NULL, szStoredHash, &dwSize);
+
+            if (!_stricmp(szHash, szStoredHash))
+            {
+                dwSize = sizeof(DWORD);
+                RegQueryValueExW(hKey, TEXT(STARTDOCKED_SB_0), 0, NULL, &symbols_PTRS->startdocked_PTRS[0], &dwSize);
+                RegQueryValueExW(hKey, TEXT(STARTDOCKED_SB_1), 0, NULL, &symbols_PTRS->startdocked_PTRS[1], &dwSize);
+                RegQueryValueExW(hKey, TEXT(STARTDOCKED_SB_2), 0, NULL, &symbols_PTRS->startdocked_PTRS[2], &dwSize);
+                RegQueryValueExW(hKey, TEXT(STARTDOCKED_SB_3), 0, NULL, &symbols_PTRS->startdocked_PTRS[3], &dwSize);
+                RegQueryValueExW(hKey, TEXT(STARTDOCKED_SB_4), 0, NULL, &symbols_PTRS->startdocked_PTRS[4], &dwSize);
+                bOffsetsValid = TRUE;
+            }
+            else
+            {
+                printf("[Symbols] Symbols for \"%s\" are not available.\n", STARTDOCKED_SB_NAME);
+                result.bNeedToDownloadStartDockedSymbols = TRUE;
+            }
+        }
+        if (hKey) RegCloseKey(hKey);
+        if (!bOffsetsValid)
+        {
+            RegDeleteTreeW(
+                HKEY_CURRENT_USER,
+                TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTDOCKED_SB_NAME)
             );
         }
     }
-    return bNeedToDownload;
+
+    if (rovi.dwBuildNumber >= 18362)
+    {
+        // Load StartUI.dll offsets
+        bOffsetsValid = FALSE;
+        RegCreateKeyExW(
+            HKEY_CURRENT_USER,
+            TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME),
+            0,
+            NULL,
+            REG_OPTION_NON_VOLATILE,
+            KEY_READ,
+            NULL,
+            &hKey,
+            &dwDisposition
+        );
+
+        GetWindowsDirectoryW(wszPath, MAX_PATH);
+        wcscat_s(wszPath, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\" TEXT(STARTUI_SB_NAME) L".dll");
+        if (ComputeFileHash(wszPath, szHash, ARRAYSIZE(szHash)) == ERROR_SUCCESS)
+        {
+            szStoredHash[0] = 0;
+            dwSize = sizeof(szStoredHash);
+            RegQueryValueExA(hKey, "Hash", 0, NULL, szStoredHash, &dwSize);
+
+            if (!_stricmp(szHash, szStoredHash))
+            {
+                dwSize = sizeof(DWORD);
+                RegQueryValueExW(hKey, TEXT(STARTUI_SB_0), 0, NULL, &symbols_PTRS->startui_PTRS[0], &dwSize);
+                bOffsetsValid = TRUE;
+            }
+            else
+            {
+                printf("[Symbols] Symbols for \"%s\" are not available.\n", STARTUI_SB_NAME);
+                result.bNeedToDownloadStartUISymbols = TRUE;
+            }
+        }
+        if (hKey) RegCloseKey(hKey);
+        if (!bOffsetsValid)
+        {
+            RegDeleteTreeW(
+               HKEY_CURRENT_USER,
+               TEXT(REGPATH_STARTMENU) L"\\" TEXT(STARTUI_SB_NAME)
+           );
+        }
+    }
+
+    // Delete "OSBuild" value from previous versions of EP
+    RegCreateKeyExW(
+        HKEY_CURRENT_USER,
+        TEXT(REGPATH),
+        0,
+        NULL,
+        REG_OPTION_NON_VOLATILE,
+        KEY_WRITE,
+        NULL,
+        &hKey,
+        &dwDisposition
+    );
+    if (hKey && hKey != INVALID_HANDLE_VALUE)
+    {
+        RegDeleteValueW(hKey, TEXT("OSBuild"));
+        RegCloseKey(hKey);
+    }
+
+    result.bSuccess = TRUE;
+    return result;
 }
diff --git a/ExplorerPatcher/symbols.h b/ExplorerPatcher/symbols.h
index d70b55c..9f2326f 100644
--- a/ExplorerPatcher/symbols.h
+++ b/ExplorerPatcher/symbols.h
@@ -40,14 +40,28 @@ typedef struct symbols_addr
 } symbols_addr;
 #pragma pack(pop)
 
+typedef struct _LoadSymbolsResult
+{
+    BOOL bSuccess : 1;
+    BOOL bNeedToDownloadTwinuiPcshellSymbols : 1;
+    BOOL bNeedToDownloadStartDockedSymbols : 1;
+    BOOL bNeedToDownloadStartUISymbols : 1;
+} LoadSymbolsResult;
+
+inline BOOL NeedToDownloadSymbols(const LoadSymbolsResult* pLoadResult)
+{
+    return pLoadResult->bNeedToDownloadTwinuiPcshellSymbols || pLoadResult->bNeedToDownloadStartDockedSymbols || pLoadResult->bNeedToDownloadStartUISymbols;
+}
+
 typedef struct _DownloadSymbolsParams
 {
     HMODULE hModule;
     BOOL bVerbose;
+    LoadSymbolsResult loadResult;
 } DownloadSymbolsParams;
 DWORD DownloadSymbols(DownloadSymbolsParams* params);
 
-BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule);
+LoadSymbolsResult LoadSymbols(symbols_addr* symbols_PTRS);
 
 inline BOOL IsBuild(RTL_OSVERSIONINFOW rovi, DWORD32 ubr, DWORD BuildNumber, DWORD BuildMinor)
 {
diff --git a/ExplorerPatcher/utility.h b/ExplorerPatcher/utility.h
index 6f96817..bb31a72 100644
--- a/ExplorerPatcher/utility.h
+++ b/ExplorerPatcher/utility.h
@@ -258,7 +258,15 @@ __declspec(dllexport) CALLBACK ZZRestartExplorer(HWND hWnd, HINSTANCE hInstance,
 #define MIN(X, Y) (((X) < (Y)) ? (X) : (Y))
 #define MAX(X, Y) (((X) > (Y)) ? (X) : (Y))
 
-FARPROC SHRegGetValueFromHKCUHKLMFunc;
+typedef LSTATUS(*t_SHRegGetValueFromHKCUHKLM)(
+    PCWSTR pwszKey,
+    PCWSTR pwszValue,
+    int/*SRRF*/ srrfFlags,
+    DWORD* pdwType,
+    void* pvData,
+    DWORD* pcbData
+);
+t_SHRegGetValueFromHKCUHKLM SHRegGetValueFromHKCUHKLMFunc;
 
 inline LSTATUS SHRegGetValueFromHKCUHKLMWithOpt(
     PCWSTR pwszKey,