Merge branch 'valinet:master' into master

deep-soft · Jul 28, 2023 · 361a743 · 361a743
2 parents 59c09f4 + 53ff541
commit 361a743
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 This document includes the same release notes as in the [Releases](https://github.com/valinet/ExplorerPatcher/releases) section on GitHub.
 
+## 22621.1992.56
+
+Tested on OS build 22621.1992. Installer requires Internet connectivity.
+
+#### Details
+
+##### 1
+
+* Windows 10 Start menu: Fixed a bug that prevented the menu from working on OS builds 22621.1413 and newer (46c5041). Please read these important notes regarding the fix [here](https://github.com/valinet/ExplorerPatcher/discussions/1679).
+
 ## 22621.1555.55
 
 Tested on OS build 22621.1555. Installer requires Internet connectivity.

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
@@ -9245,19 +9245,20 @@ HMODULE patched_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE hFile, DWORD dwFlag
 {
     WCHAR path[MAX_PATH];
     GetSystemDirectoryW(path, MAX_PATH);
-    wcscat_s(path, MAX_PATH, L"\\StartTileData.dll");
+    wcscat_s(path, MAX_PATH, L"\\AppResolver.dll");
     if (!_wcsicmp(path, lpLibFileName))
     {
         GetWindowsDirectoryW(path, MAX_PATH);
-        wcscat_s(path, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\StartTileDataLegacy.dll");
+        wcscat_s(path, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\AppResolverLegacy.dll");
         return LoadLibraryExW(path, hFile, dwFlags);
     }
+    if (IsWindows11Version22H2Build1413OrHigher()) return LoadLibraryExW(lpLibFileName, hFile, dwFlags);
     GetSystemDirectoryW(path, MAX_PATH);
-    wcscat_s(path, MAX_PATH, L"\\AppResolver.dll");
+    wcscat_s(path, MAX_PATH, L"\\StartTileData.dll");
     if (!_wcsicmp(path, lpLibFileName))
     {
         GetWindowsDirectoryW(path, MAX_PATH);
-        wcscat_s(path, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\AppResolverLegacy.dll");
+        wcscat_s(path, MAX_PATH, L"\\SystemApps\\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\\StartTileDataLegacy.dll");
         return LoadLibraryExW(path, hFile, dwFlags);
     }
     return LoadLibraryExW(lpLibFileName, hFile, dwFlags);

diff --git a/ExplorerPatcher/settings.reg b/ExplorerPatcher/settings.reg
@@ -328,6 +328,8 @@
 ;"Virtualized_{D17F1E1A-5919-4427-8F89-A1A8503CA3EB}_NoStartMenuMorePrograms"=dword:00000000
 ;u Pin tiles to Windows 10 Start menu from File Explorer
 ;pin_tiles
+;y IMPORTANT, MUST READ: Notice regarding this feature (online)
+;https://github.com/valinet/ExplorerPatcher/discussions/1679
 ;g StartMenu_Windows10
 
 

diff --git a/version.h b/version.h
@@ -1,7 +1,7 @@
 #define VER_MAJOR 22621
-#define VER_MINOR 1555
-#define VER_BUILD_HI    55
-#define VER_BUILD_LO 2
+#define VER_MINOR 1992
+#define VER_BUILD_HI    56
+#define VER_BUILD_LO 1
 #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", "22621.1555.55.2"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1555.55.2"
+#define VER_FILE_STRING VALUE "FileVersion", "22621.1992.56.1"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1992.56.1"