From 085b3dd9f7062dc4bde720a0f8fd1f27442e8300 Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Wed, 4 Oct 2023 02:33:55 +0300
Subject: [PATCH 1/2] Taskbar11: Fixed a bug that reset the "never combine"
 setting on OS builds 22621.2361+

---
 ExplorerPatcher/dllmain.c   | 51 ++++++++-----------------------------
 ExplorerPatcher/lvt.h       |  1 +
 ExplorerPatcher/osutility.h |  7 +++++
 3 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 2c96e072a..ae18d82a3 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -11506,51 +11506,20 @@ DWORD Inject(BOOL bIsExplorer)
         ResetEvent(hEvent);
     }*/
 
-    if (bOldTaskbar)
-    {
-        if (IsWindows11())
-        {
-            CreateThread(
-                0,
-                0,
-                PlayStartupSound,
-                0,
-                0,
-                0
-            );
+    if (IsWindows11()) {
+        if (bOldTaskbar) {
+            CreateThread(0, 0, PlayStartupSound, 0, 0, 0);
             printf("Play startup sound thread...\n");
-        }
-    }
-
-
-    if (bOldTaskbar)
-    {
-        if (IsWindows11())
-        {
-            CreateThread(
-                0,
-                0,
-                SignalShellReady,
-                dwExplorerReadyDelay,
-                0,
-                0
-            );
+            CreateThread(0, 0, SignalShellReady, dwExplorerReadyDelay, 0, 0);
             printf("Signal shell ready...\n");
+        } else {
+            CreateThread(0, 0, FixTaskbarAutohide, 0, 0, 0);
+            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");
+            }
         }
     }
-    else
-    {
-        CreateThread(
-            0,
-            0,
-            FixTaskbarAutohide,
-            0,
-            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");
-    }
 
     if (IsWindows11Version22H2OrHigher() && bOldTaskbar)
     {
diff --git a/ExplorerPatcher/lvt.h b/ExplorerPatcher/lvt.h
index 49691b69c..4cd1515a9 100644
--- a/ExplorerPatcher/lvt.h
+++ b/ExplorerPatcher/lvt.h
@@ -7,6 +7,7 @@
 #include <winstring.h>
 #include <stdio.h>
 #include <Shlwapi.h>
+#include "osutility.h"
 
 #define LVT_LOC_NONE 0
 #define LVT_LOC_BOTTOMLEFT 1
diff --git a/ExplorerPatcher/osutility.h b/ExplorerPatcher/osutility.h
index affc78c85..833b6484c 100644
--- a/ExplorerPatcher/osutility.h
+++ b/ExplorerPatcher/osutility.h
@@ -87,4 +87,11 @@ inline BOOL IsWindows11Version22H2Build2134OrHigher()
     if (global_rovi.dwBuildNumber > 22621) return TRUE;
     return global_rovi.dwBuildNumber == 22621 && global_ubr >= 2134;
 }
+
+inline BOOL IsWindows11Version22H2Build2361OrHigher()
+{
+    if (!global_rovi.dwMajorVersion) global_ubr = VnGetOSVersionAndUBR(&global_rovi);
+    if (global_rovi.dwBuildNumber > 22621) return TRUE;
+    return global_rovi.dwBuildNumber == 22621 && global_ubr >= 2361;
+}
 #endif

From fbaad56b22178772dec80eb86c5821a06295a098 Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Wed, 4 Oct 2023 03:12:50 +0300
Subject: [PATCH 2/2] Version: 22621.2361.58.2

---
 CHANGELOG.md |  8 ++++++++
 version.h    | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c03c7bd0..53702b6c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,14 @@ Tested on OS builds 22000.2416, 22621.1, 22621.2134, 22621.2361, 22631.2338, and
 * File Explorer: EP now tries to avoid crashes related to the new Windows App SDK views. (b426d2c)
 * On OS builds 22621+, fixed a bug that crashed `explorer.exe` when required functions in `twinui.pcshell.dll` (for Win+X and Windows 10 Alt+Tab) could not be found using the fallback method. (6023718)
 
+##### 2
+
+* Taskbar11: Fixed a bug that reset the "never combine" setting on OS builds 22621.2361+ (#2207) (085b3dd)
+* Taskbar10: Fixed Wi-Fi flyout buttons on OS build 22621 (0706393)
+* Start10: Fixed start menu folders, show recently added, and show frequently used apps settings not being applied on OS builds 22621.2134+ (e28940d)
+
+Many thanks to @Amrsatrio for sustained efforts in maintaining and improving ExplorerPatcher.
+
 ## 22621.2283.57
 
 Tested on OS build 22621.2283. Installer requires Internet connectivity.
diff --git a/version.h b/version.h
index 3144e746a..b7769eae1 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 1
+#define VER_BUILD_LO 2
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -11,6 +11,10 @@
 
 #define VER_STR(arg) #arg
 
+#define STRINGIFYVER2(X)      #X
+#define STRINGIFYVER(X)       STRINGIFYVER2(X)
+#define VER_WITH_DOTS STRINGIFYVER(VER_MAJOR) "." STRINGIFYVER(VER_MINOR) "." STRINGIFYVER(VER_BUILD_HI) "." STRINGIFYVER(VER_BUILD_LO)
+
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22621.2361.58.1"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.2361.58.1"
+#define VER_FILE_STRING VALUE "FileVersion", VER_WITH_DOTS
+#define VER_PRODUCT_STRING VALUE "ProductVersion", VER_WITH_DOTS