Available symbols download properly on Insider builds

CHANGELOG.md

@@ -28,7 +28,8 @@ Tested on OS build 22000.376.
 * Fixed a wrong function prototype (5b4bd07#r62018175, thanks @Simplestas)
 * Protected some state variables from changing internally if modified in the registry until `explorer` is restarted
 * Fixed a bug that could unexpectedly prevent the [Win]+[Alt]+[D] shortcut from working properly
-* Windows 10 language switcher displays correctly when the taskbar is placed in some location other than the bottom of the screen (#629) (.2).
+* Windows 10 language switcher displays correctly when the taskbar is placed in some location other than the bottom of the screen (#629) (.2)
+* Available symbols download properly on Insider builds (tested on 22526.1000) (.3)
 
 ## 22000.376.40
 

ExplorerPatcher/symbols.c

@@ -234,7 +234,7 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
         TWINUI_PCSHELL_SB_CNT
     ))
     {
-        printf("[Symbols] Hooking Win+C is not available for this build.\n");
+        printf("[Symbols] Hooking Win+C is not available in this build.\n");
         DWORD dwZero = 0;
         RegSetValueExW(
             hKey,
@@ -250,6 +250,23 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
             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)
@@ -262,6 +279,7 @@ DWORD DownloadSymbols(DownloadSymbolsParams* params)
                 return 5;
             }
         }
+    }
     RegSetValueExW(
         hKey,
         TEXT(TWINUI_PCSHELL_SB_0),
@@ -856,7 +874,8 @@ BOOL LoadSymbols(symbols_addr* symbols_PTRS, HMODULE hModule)
     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 - 1 &&
+            (((DWORD*)symbols_PTRS) + i) != symbols_PTRS->twinui_pcshell_PTRS + TWINUI_PCSHELL_SB_CNT - 2
             )
         {
             bNeedToDownload = TRUE;

version.h

@@ -1,7 +1,7 @@
 #define VER_MAJOR 22000
 #define VER_MINOR 376
 #define VER_BUILD_HI    41
-#define VER_BUILD_LO 2
+#define VER_BUILD_LO 3
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22000.376.41.2"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.376.41.2"
+#define VER_FILE_STRING VALUE "FileVersion", "22000.376.41.3"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.376.41.3"