Merge branch 'valinet:master' into master

Yukari316 · Mar 21, 2023 · 758cb28 · 758cb28
2 parents 6563b0d + 0344a5e
commit 758cb28
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,14 @@ Please make sure you are connected to the Internet while installing, the applica
 
 * Windows 11 Start menu: Better enforcement for disabling the "Recommended" section. (27a8fd9)
 
+##### 4
+
+* Windows 11 Start menu: Fixed a bug that prevented the menu from working when the setting "Disable Recommended section" is used and the display scaling is 125%. (5649a83)
+
+##### 5
+
+* Fixed a bug that could crash File Explorer on older OS builds, like 17763 (LTSC 2019). (6bc2ea5)
+
 ## 22621.1344.53
 
 Tested on OS builds 22621.1344, 22000.1574, and 19044.1466.

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
@@ -10162,15 +10162,17 @@ DWORD Inject(BOOL bIsExplorer)
     }
 
     RtlQueryFeatureConfigurationFunc = GetProcAddress(GetModuleHandleW(L"ntdll.dll"), "RtlQueryFeatureConfiguration");
-    rv = funchook_prepare(
-        funchook,
-        (void**)&RtlQueryFeatureConfigurationFunc,
-        RtlQueryFeatureConfigurationHook
-    );
-    if (rv != 0)
-    {
-        FreeLibraryAndExitThread(hModule, rv);
-        return FALSE;
+    if (RtlQueryFeatureConfigurationFunc) {
+        rv = funchook_prepare(
+            funchook,
+            (void**)&RtlQueryFeatureConfigurationFunc,
+            RtlQueryFeatureConfigurationHook
+        );
+        if (rv != 0)
+        {
+            FreeLibraryAndExitThread(hModule, rv);
+            return FALSE;
+        }
     }
     printf("Setup ntdll functions done\n");
 

diff --git a/ExplorerPatcher/lvt.c b/ExplorerPatcher/lvt.c
@@ -573,9 +573,9 @@ void LVT_StartDocked_120DPIHack(int maxHeight)
                         pStartSizingFrame->lpVtbl->QueryInterface(pStartSizingFrame, &IID_Windows_UI_Xaml_IFrameworkElement, &pFrameworkElement);
                         if (pFrameworkElement)
                         {
-                            pIUIElement->lpVtbl->put_Visibility(pIUIElement, Windows_UI_Xaml_Visibility_Collapsed);
+                            if (!IsWindows11Version22H2Build1413OrHigher()) pIUIElement->lpVtbl->put_Visibility(pIUIElement, Windows_UI_Xaml_Visibility_Collapsed);
                             pFrameworkElement->lpVtbl->put_MaxHeight(pFrameworkElement, maxHeight);
-                            pIUIElement->lpVtbl->put_Visibility(pIUIElement, Windows_UI_Xaml_Visibility_Visible);
+                            if (!IsWindows11Version22H2Build1413OrHigher()) pIUIElement->lpVtbl->put_Visibility(pIUIElement, Windows_UI_Xaml_Visibility_Visible);
                             pFrameworkElement->lpVtbl->Release(pFrameworkElement);
                         }
                         pIUIElement->lpVtbl->Release(pIUIElement);

diff --git a/version.h b/version.h
@@ -1,7 +1,7 @@
 #define VER_MAJOR 22621
 #define VER_MINOR 1413
 #define VER_BUILD_HI    54
-#define VER_BUILD_LO 3
+#define VER_BUILD_LO 5
 #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.1413.54.3"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1413.54.3"
+#define VER_FILE_STRING VALUE "FileVersion", "22621.1413.54.5"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22621.1413.54.5"