Merge branch 'valinet-master'

creeper-0910 · Oct 7, 2023 · 48cb91d · 48cb91d
2 parents 778ee62 + d4b4378
commit 48cb91d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,13 @@ Tested on OS builds 22000.2416, 22621.1, 22621.2134, 22621.2361, 22631.2338, and
 
 * Start10: Pin to Start/Unpin from Start has been properly fixed on Start Menu and Explorer (but not Search yet) of all Windows 11 builds. (15c07a0)
 * Start10: Fixed non-UWP apps not appearing on Dev channel builds 23545+. (a4f5bd0)
+* File Explorer: Fixed command bar settings not being applied on non-primary Explorer instances on Windows 11. (001e8d8)
+
+##### 4
+
+* Taskbar11: Restored the fix for the bug that reset the "never combine" setting on OS builds 22621.2361+, which was removed in 22621.2361.58.3 by accident. (9f04110)
+* Start: "Start menu style" now requires restart so that Pin to Start/Unpin from Start on Explorer works properly. (bdd71ef)
+* Taskbar10: Disabled the patch for proper acrylic background on Canary builds (25000+) for now. (4ee742f)
 
 Many thanks to @Amrsatrio for sustained efforts in maintaining and improving ExplorerPatcher.
 

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
@@ -11048,7 +11048,10 @@ DWORD Inject(BOOL bIsExplorer)
     if (bOldTaskbar && global_rovi.dwBuildNumber >= 22572)
     {
         VnPatchIAT(hExplorer, "dwmapi.dll", "DwmUpdateThumbnailProperties", explorer_DwmUpdateThumbnailPropertiesHook);
-        PatchExplorer_UpdateWindowAccentProperties();
+        if (global_rovi.dwBuildNumber < 25000) // TODO Needs fixing in Canary
+        {
+            PatchExplorer_UpdateWindowAccentProperties();
+        }
     }
     if (IsWindows11())
     {
@@ -11533,7 +11536,7 @@ DWORD Inject(BOOL bIsExplorer)
         else
         {
             CreateThread(0, 0, FixTaskbarAutohide, 0, 0, 0);
-            if (IsWindows11Version23H2OrHigher())
+            if (!IsWindows11Version22H2Build2361OrHigher())
             {
                 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
@@ -248,7 +248,7 @@
 
 ;T スタート メニュー
 [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced]
-;z 2 スタート メニューのスタイル
+;z 2 スタート メニューのスタイル *
 ;x 0 Windows 11 (デフォルト)
 ;x 1 Windows 10
 "Start_ShowClassicMode"=dword:00000000

diff --git a/version.h b/version.h
@@ -1,7 +1,7 @@
 #define VER_MAJOR 22621
 #define VER_MINOR 2361
 #define VER_BUILD_HI    58
-#define VER_BUILD_LO 3
+#define VER_BUILD_LO 4
 #define VER_FLAGS   VS_FF_PRERELEASE