Froz
/
ExplorerPatcher
mirror of https://github.com/valinet/ExplorerPatcher.git
1
0
Fork 0
Code Issues Projects Releases 1 Wiki Activity
Browse Source

Fix TrayUIInstance ptr NULL check to allow it to run on 23H2 Insider

pull/1138/head
Misty 3 years ago
parent
4f3dab5a5c
commit
221d0e4f4d
1 changed files with 5 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ExplorerPatcher/dllmain.c

8
ExplorerPatcher/dllmain.c
Unescape View File

@ -2491,14 +2491,16 @@ INT64 Shell_TrayWndSubclassProc(
HWND hShellTray_Wnd = FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL); HWND hShellTray_Wnd = FindWindowExW(NULL, NULL, L"Shell_TrayWnd", NULL);
INT64* CTrayInstance = (BYTE*)(GetWindowLongPtrW(hShellTray_Wnd, 0)); // -> CTray INT64* CTrayInstance = (BYTE*)(GetWindowLongPtrW(hShellTray_Wnd, 0)); // -> CTray
const unsigned int TRAYUI_OFFSET_IN_CTRAY = 110; const unsigned int TRAYUI_OFFSET_IN_CTRAY = 110;
uintptr_t TrayUIInstance = *((INT64*)CTrayInstance + TRAYUI_OFFSET_IN_CTRAY) + 8; uintptr_t TrayUIInstance = *((INT64*)CTrayInstance + TRAYUI_OFFSET_IN_CTRAY);
if (TrayUIInstance) if (TrayUIInstance)
{ {
TrayUIInstance += 8;
int offset = 656; int offset = 656;
if (IsWindows11Version22H2OrHigher()) offset = 640; if (IsWindows11Version22H2OrHigher()) offset = 640;
if ((*(unsigned __int8(__fastcall**)(INT64))(**(INT64**)(TrayUIInstance + offset) + 104i64))(*(INT64*)(TrayUIInstance + offset))) if (!**(INT64**)(TrayUIInstance + offset)
|| (*(unsigned __int8(__fastcall**)(INT64))(**(INT64**)(TrayUIInstance + offset) + 104i64))(*(INT64*)(TrayUIInstance + offset)) )
{ {
DeleteMenu(hSubMenu, 0x1A0u, 0); DeleteMenu(hSubMenu, 416, MF_BYCOMMAND); // Undo
} }
else else
{ {

Write Preview
Loading…
Cancel
Save