Cool_Tools/ExplorerPatcher
1
0
Fork 0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2024-11-27 17:00:59 +01:00
Code Releases Wiki Activity

Taskbar10: Adjusted the conditions for the hotkey registration patch

Browse Source
This commit is contained in:
Amrsatrio 2024-03-13 07:47:08 +07:00
parent 0589a251c1
commit 623eceedd0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ExplorerPatcher/dllmain.c
View File

@ -8896,8 +8896,7 @@ __declspec(dllexport) HRESULT explorer_CoCreateInstanceHook(REFCLSID rclsid, LPU
{ {
if (bOldTaskbar && explorer_TrayUI_CreateInstanceFunc) if (bOldTaskbar && explorer_TrayUI_CreateInstanceFunc)
{ {
*ppv = &instanceof_ITrayUIComponent; return EPTrayUIComponent_CreateInstance(riid, ppv);
return S_OK;
} }
} }
return CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv); return CoCreateInstance(rclsid, pUnkOuter, dwClsContext, riid, ppv);
@ -9312,11 +9311,11 @@ BOOL explorer_RegisterHotkeyHook(HWND hWnd, int id, UINT fsModifiers, UINT vk)
if (!bWinBHotkeyRegistered && fsModifiers == (MOD_WIN | MOD_NOREPEAT) && vk == 'D') // right after Win+D if (!bWinBHotkeyRegistered && fsModifiers == (MOD_WIN | MOD_NOREPEAT) && vk == 'D') // right after Win+D
{ {
#if USE_MOMENT_3_FIXES_ON_MOMENT_2 #if USE_MOMENT_3_FIXES_ON_MOMENT_2
BOOL bPerformMoment2Patches = IsWindows11Version22H2Build1413OrHigher(); BOOL bPerformMoment2Patches = IsWindows11Version22H2Build1413OrHigher() && bOldTaskbar;
#else #else
BOOL bPerformMoment2Patches = IsWindows11Version22H2Build2134OrHigher(); BOOL bPerformMoment2Patches = bOldTaskbar ? bOldTaskbar == 1 ? IsWindows11Version22H2Build2134OrHigher() : IsWindows11Version22H2Build1413OrHigher() : FALSE;
#endif #endif
if (bPerformMoment2Patches && bOldTaskbar) if (bPerformMoment2Patches)
{ {
// Might be better if we scan the GlobalKeylist array to prevent hardcoded numbers? // Might be better if we scan the GlobalKeylist array to prevent hardcoded numbers?
RegisterHotKey(hWnd, 500, MOD_WIN | MOD_NOREPEAT, 'A'); RegisterHotKey(hWnd, 500, MOD_WIN | MOD_NOREPEAT, 'A');