Skip to content

Commit

Permalink
Taskbar10: Pulled back 2cc87ab
Browse files Browse the repository at this point in the history
Crashes on 22621.2428 (by a call from Windows.UI.Immersive.dll), needs further investigation for a proper fix
  • Loading branch information
Amrsatrio committed Oct 21, 2023
1 parent 4999f1d commit a77aff4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 5 additions & 4 deletions ExplorerPatcher/dllmain.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand All @@ -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+
Expand Down

0 comments on commit a77aff4

Please sign in to comment.