From debf37a84198d8e1a5e40506222172023786fad7 Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Thu, 23 Dec 2021 21:02:39 +0200
Subject: [PATCH] Fixed #564 (the glom level settings for the Windows 10
 taskbar are now stored separately, as setting the glom level to any other
 value than 0 breaks the window previews in the Windows 11 taskbar)

---
 ExplorerPatcher/dllmain.c    | 66 +++++++++++++++++++++++++++++++++---
 ExplorerPatcher/settings.reg |  6 ++--
 2 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index be6e873..86bbeea 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -78,6 +78,10 @@ BOOL bDoNotRedirectSystemToSettingsApp = FALSE;
 BOOL bDoNotRedirectProgramsAndFeaturesToSettingsApp = FALSE;
 BOOL bDoNotRedirectDateAndTimeToSettingsApp = FALSE;
 BOOL bDoNotRedirectNotificationIconsToSettingsApp = FALSE;
+#define TASKBARGLOMLEVEL_DEFAULT 2
+#define MMTASKBARGLOMLEVEL_DEFAULT 2
+DWORD dwTaskbarGlomLevel = TASKBARGLOMLEVEL_DEFAULT;
+DWORD dwMMTaskbarGlomLevel = MMTASKBARGLOMLEVEL_DEFAULT;
 HMODULE hModule = NULL;
 HANDLE hDelayedInjectionThread = NULL;
 HANDLE hIsWinXShown = NULL;
@@ -91,6 +95,7 @@ DWORD dwMonitorCount = 0;
 int Code = 0;
 HRESULT InjectStartFromExplorer();
 void InvokeClockFlyout();
+void WINAPI Explorer_RefreshUI(int unused);
 
 #define ORB_STYLE_WINDOWS10 0
 #define ORB_STYLE_WINDOWS11 1
@@ -3828,8 +3833,12 @@ DWORD WindowSwitcher(DWORD unused)
 
 
 #pragma region "Load Settings from registry"
-void WINAPI LoadSettings(BOOL bIsExplorer)
+void WINAPI LoadSettings(LPARAM lParam)
 {
+    BOOL bIsExplorer = LOWORD(lParam);
+    BOOL bIsRefreshAllowed = HIWORD(lParam);
+    BOOL bShouldRefreshUI = FALSE;
+
     HKEY hKey = NULL;
     DWORD dwSize = 0, dwTemp = 0;
 
@@ -4280,6 +4289,36 @@ void WINAPI LoadSettings(BOOL bIsExplorer)
             &bDoNotRedirectNotificationIconsToSettingsApp,
             &dwSize
         );
+        dwTemp = TASKBARGLOMLEVEL_DEFAULT;
+        dwSize = sizeof(DWORD);
+        RegQueryValueExW(
+            hKey,
+            TEXT("TaskbarGlomLevel"),
+            0,
+            NULL,
+            &dwTemp,
+            &dwSize
+        );
+        if (dwTemp != dwTaskbarGlomLevel)
+        {
+            bShouldRefreshUI = TRUE;
+        }
+        dwTaskbarGlomLevel = dwTemp;
+        dwTemp = MMTASKBARGLOMLEVEL_DEFAULT;
+        dwSize = sizeof(DWORD);
+        RegQueryValueExW(
+            hKey,
+            TEXT("MMTaskbarGlomLevel"),
+            0,
+            NULL,
+            &dwTemp,
+            &dwSize
+        );
+        if (dwTemp != dwMMTaskbarGlomLevel)
+        {
+            bShouldRefreshUI = TRUE;
+        }
+        dwMMTaskbarGlomLevel = dwTemp;
         RegCloseKey(hKey);
     }
 
@@ -4470,6 +4509,11 @@ void WINAPI LoadSettings(BOOL bIsExplorer)
     {
         RegCloseKey(hKey);
     }
+
+    if (bIsRefreshAllowed && bShouldRefreshUI)
+    {
+        Explorer_RefreshUI(0);
+    }
 }
 
 void Explorer_RefreshClockHelper(HWND hClockButton)
@@ -5617,6 +5661,16 @@ LSTATUS explorer_RegGetValueW(
             *(DWORD*)pvData = 1;
         }
     }
+    else if (!lstrcmpW(lpValue, L"TaskbarGlomLevel") || !lstrcmpW(lpValue, L"MMTaskbarGlomLevel"))
+    {
+        lRes = RegGetValueW(HKEY_CURRENT_USER, _T(REGPATH), lpValue, dwFlags, pdwType, pvData, pcbData);
+        if (lRes != ERROR_SUCCESS)
+        {
+            *(DWORD*)pvData = (lpValue[0] == L'T' ? TASKBARGLOMLEVEL_DEFAULT : MMTASKBARGLOMLEVEL_DEFAULT);
+            *(DWORD*)pcbData = sizeof(DWORD32);
+            lRes = ERROR_SUCCESS;
+        }
+    }
     /*else if (!lstrcmpW(lpValue, L"PeopleBand"))
     {
         lRes = RegGetValueW(hkey, lpSubKey, L"TaskbarMn", dwFlags, pdwType, pvData, pcbData);
@@ -6023,7 +6077,7 @@ DWORD Inject(BOOL bIsExplorer)
 
     int rv;
 
-    LoadSettings(bIsExplorer);
+    LoadSettings(MAKELPARAM(bIsExplorer, FALSE));
 
 #ifdef _WIN64
     if (bIsExplorer)
@@ -6059,7 +6113,7 @@ DWORD Inject(BOOL bIsExplorer)
         if (cs < numSettings)
         {
             settings[cs].callback = LoadSettings;
-            settings[cs].data = bIsExplorer;
+            settings[cs].data = MAKELPARAM(bIsExplorer, TRUE);
             settings[cs].hEvent = NULL;
             settings[cs].hKey = NULL;
             wcscpy_s(settings[cs].name, MAX_PATH, TEXT(REGPATH));
@@ -6070,7 +6124,7 @@ DWORD Inject(BOOL bIsExplorer)
         if (cs < numSettings)
         {
             settings[cs].callback = LoadSettings;
-            settings[cs].data = bIsExplorer;
+            settings[cs].data = MAKELPARAM(bIsExplorer, FALSE);
             settings[cs].hEvent = NULL;
             settings[cs].hKey = NULL;
             wcscpy_s(settings[cs].name, MAX_PATH, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\StartPage");
@@ -6169,7 +6223,7 @@ DWORD Inject(BOOL bIsExplorer)
         if (cs < numSettings)
         {
             settings[cs].callback = LoadSettings;
-            settings[cs].data = bIsExplorer;
+            settings[cs].data = MAKELPARAM(bIsExplorer, FALSE);
             settings[cs].hEvent = NULL;
             settings[cs].hKey = NULL;
             wcscpy_s(settings[cs].name, MAX_PATH, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer");
@@ -6608,6 +6662,8 @@ DWORD Inject(BOOL bIsExplorer)
             0,
             0
         );
+        RegDeleteKeyValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"TaskbarGlomLevel");
+        RegDeleteKeyValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"MMTaskbarGlomLevel");
     }
 
 
diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg
index eeea6c2..652b499 100644
--- a/ExplorerPatcher/settings.reg
+++ b/ExplorerPatcher/settings.reg
@@ -22,16 +22,16 @@
 ;;x 0 Windows 10 (default)
 ;;x 1 Windows 11
 ;;"OrbStyle"=dword:00000000
-[HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
+[HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;c 3 Combine taskbar icons on primary taskbar
 ;x 0 Always combine
 ;x 1 Combine when taskbar is full
-;x 2 Never combine
+;x 2 Never combine (default)
 "TaskbarGlomLevel"=dword:00000002
 ;c 3 Combine taskbar icons on secondary taskbar(s)
 ;x 0 Always combine
 ;x 1 Combine when taskbar is full
-;x 2 Never combine
+;x 2 Never combine (default)
 "MMTaskbarGlomLevel"=dword:00000002
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;c 4 Primary taskbar location on screen *