From 9f04110d72b2feb03c643ebf19ef61e8ec083288 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 6 Oct 2023 22:02:10 +0700 Subject: [PATCH 1/4] Taskbar11: Restored commit 085b3dd that I modified by accident --- CHANGELOG.md | 1 + ExplorerPatcher/dllmain.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd610a721..1f286d252 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ 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) Many thanks to @Amrsatrio for sustained efforts in maintaining and improving ExplorerPatcher. diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c index 1af3d82ec..fb392f88f 100644 --- a/ExplorerPatcher/dllmain.c +++ b/ExplorerPatcher/dllmain.c @@ -11533,7 +11533,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"); From bdd71efeb9458d399ec554b814cd1c3ba82bd665 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Fri, 6 Oct 2023 22:07:53 +0700 Subject: [PATCH 2/4] Start: Indicate that "Start menu style" requires restart so that Explorer tile pinning works properly. --- ExplorerPatcher/settings.reg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg index 0fde220c7..4f2594dac 100644 --- a/ExplorerPatcher/settings.reg +++ b/ExplorerPatcher/settings.reg @@ -248,7 +248,7 @@ ;T Start menu [HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced] -;z 2 Start menu style +;z 2 Start menu style * ;x 0 Windows 11 (default) ;x 1 Windows 10 "Start_ShowClassicMode"=dword:00000000 From 4ee742f116d252ae5b609bbff9ff1f7f18ed0049 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Sat, 7 Oct 2023 03:24:58 +0700 Subject: [PATCH 3/4] Taskbar10: Disabled the patch for proper acrylic background on Canary builds I'm adding this check until a proper fix is made, so that EP can run on Canary although features will be very limited --- ExplorerPatcher/dllmain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c index fb392f88f..4115891c7 100644 --- 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()) { From b157abad62d2323d70eeba187aaca899da242667 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Sat, 7 Oct 2023 03:31:22 +0700 Subject: [PATCH 4/4] Version: 22621.2361.58.4 --- CHANGELOG.md | 6 ++++++ version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f286d252..72400451c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,12 @@ Tested on OS builds 22000.2416, 22621.1, 22621.2134, 22621.2361, 22631.2338, and * 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. Thanks to @ARestrepo228 for hints on fixing Pin to Start/Unpin from Start. diff --git a/version.h b/version.h index 1f8b99f56..aa2215c90 100644 --- 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