From a77aff4b296a21417ea252debc95e0156e1e6245 Mon Sep 17 00:00:00 2001 From: Amrsatrio Date: Sun, 22 Oct 2023 02:37:04 +0700 Subject: [PATCH] Taskbar10: Pulled back 2cc87ab Crashes on 22621.2428 (by a call from Windows.UI.Immersive.dll), needs further investigation for a proper fix --- CHANGELOG.md | 2 ++ ExplorerPatcher/dllmain.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79070fbb3..1cdc27eeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ Tested on OS builds 22000.2416, 22621.2428, 23555.1000, and 23560.1000. ##### 1 +Note: After updating to this version, the symbols will be re-downloaded even if they have been downloaded before. + * Taskbar10: Fixed Control Center and Toast Center positioning on build 25951 (Canary). (dca0b3a) * Taskbar10: Fixed start menu position when the taskbar is at the left or right side on Moment 4 builds. (a57471f) * Taskbar10: Fixed the Windows 10 taskbar background patch to not crash anymore on build 25951 (Canary). (b52bd79) diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c index d9e963c6f..41af42f2f 100644 --- a/ExplorerPatcher/dllmain.c +++ b/ExplorerPatcher/dllmain.c @@ -11386,8 +11386,9 @@ DWORD Inject(BOOL bIsExplorer) VnPatchIAT(hExplorer, "user32.dll", (LPCSTR)2005, explorer_SetChildWindowNoActivateHook); VnPatchDelayIAT(hExplorer, "ext-ms-win-rtcore-ntuser-window-ext-l1-1-0.dll", "SendMessageW", explorer_SendMessageW); // A certain configuration update in 23560.1000 broke this method, this didn't get called with - // "RoGetActivationFactory" anymore. We're now hooking RoGetActivationFactory directly. - // VnPatchIAT(hExplorer, "api-ms-win-core-libraryloader-l1-2-0.dll", "GetProcAddress", explorer_GetProcAddressHook); + // "RoGetActivationFactory" anymore. ~~We're now hooking RoGetActivationFactory directly.~~ Pulled back for now. + explorer_RoGetActivationFactoryFunc = RoGetActivationFactory; + VnPatchIAT(hExplorer, "api-ms-win-core-libraryloader-l1-2-0.dll", "GetProcAddress", explorer_GetProcAddressHook); VnPatchIAT(hExplorer, "shell32.dll", "ShellExecuteW", explorer_ShellExecuteW); VnPatchIAT(hExplorer, "shell32.dll", "ShellExecuteExW", explorer_ShellExecuteExW); VnPatchIAT(hExplorer, "API-MS-WIN-CORE-REGISTRY-L1-1-0.DLL", "RegGetValueW", explorer_RegGetValueW); @@ -11718,7 +11719,7 @@ DWORD Inject(BOOL bIsExplorer) if (IsWindows11()) { HANDLE hCombase = LoadLibraryW(L"combase.dll"); - if (bOldTaskbar) + /*if (bOldTaskbar) // TODO Pulled back for now, crashes on 22621.2428 { // Hook RoGetActivationFactory() for old taskbar explorer_RoGetActivationFactoryFunc = GetProcAddress(hCombase, "RoGetActivationFactory"); @@ -11734,7 +11735,7 @@ DWORD Inject(BOOL bIsExplorer) { printf("Failed to hook RoGetActivationFactory(). rv = %d\n", rv); } - } + }*/ if (IsWindows11Version22H2OrHigher()) { // Fixed a bug that crashed Explorer when a folder window was opened after a first one was closed on OS builds 22621+