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

TaskbarCenter: Update TaskbarCenter_IsTaskbarHorizontal to be safer

pull/4568/head
Amrsatrio 8 months ago
parent
ab8f507ffe
commit
2633903d19
3 changed files with 159 additions and 76 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. 2
      ExplorerPatcher/ExplorerPatcher.vcxproj
  2. 136
      ExplorerPatcher/TaskbarCenter.cpp
  3. 95
      ExplorerPatcher/TaskbarCenter.h

2
ExplorerPatcher/ExplorerPatcher.vcxproj
Unescape View File

@ -251,7 +251,7 @@
<ClCompile Include="Taskbar10.cpp"> <ClCompile Include="Taskbar10.cpp">
<ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="TaskbarCenter.c"> <ClCompile Include="TaskbarCenter.cpp">
<ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(WithMainPatcher)'!='true'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="TwinUIPatches.cpp"> <ClCompile Include="TwinUIPatches.cpp">

136
ExplorerPatcher/TaskbarCenter.cpp
Unescape View File

@ -1,6 +1,10 @@
#include "TaskbarCenter.h" #include "TaskbarCenter.h"
#include "../ep_weather_host/ep_weather_host_h.h" #include "../ep_weather_host/ep_weather_host_h.h"
#include <intrin.h>
extern "C"
{
DEFINE_GUID(POLID_TurnOffSPIAnimations, 0xD7AF00A, 0xB468, 0x4A39, 0xB0, 0x16, 0x33, 0x3E, 0x22, 0x77, 0xAB, 0xED); DEFINE_GUID(POLID_TurnOffSPIAnimations, 0xD7AF00A, 0xB468, 0x4A39, 0xB0, 0x16, 0x33, 0x3E, 0x22, 0x77, 0xAB, 0xED);
extern int(*SHWindowsPolicy)(REFIID); extern int(*SHWindowsPolicy)(REFIID);
@ -24,11 +28,11 @@ HRESULT TaskbarCenter_Center(HWND hWnd, HWND hWndTaskbar, RECT rc, BOOL bIsTaskb
VARIANT vt; VARIANT vt;
long k = 0, kk = 0; long k = 0, kk = 0;
IAccessible* pAccessible = NULL; IAccessible* pAccessible = nullptr;
AccessibleObjectFromWindow(hWnd, 0, &IID_IAccessible, &pAccessible); AccessibleObjectFromWindow(hWnd, 0, IID_PPV_ARGS(&pAccessible));
if (pAccessible) if (pAccessible)
{ {
pAccessible->lpVtbl->get_accChildCount(pAccessible, &kk); pAccessible->get_accChildCount(&kk);
if (kk <= 10) if (kk <= 10)
{ {
AccessibleChildren(pAccessible, 0, kk, vtChild, &k); AccessibleChildren(pAccessible, 0, kk, vtChild, &k);
@ -36,29 +40,29 @@ HRESULT TaskbarCenter_Center(HWND hWnd, HWND hWndTaskbar, RECT rc, BOOL bIsTaskb
{ {
if (vtChild[i].vt == VT_DISPATCH) if (vtChild[i].vt == VT_DISPATCH)
{ {
IDispatch* pDisp = vtChild[i].ppdispVal; IDispatch* pDisp = vtChild[i].pdispVal;
IAccessible* pChild = NULL; IAccessible* pChild = nullptr;
pDisp->lpVtbl->QueryInterface(pDisp, &IID_IAccessible, &pChild); pDisp->QueryInterface(IID_PPV_ARGS(&pChild));
if (pChild) if (pChild)
{ {
vt.vt = VT_I4; vt.vt = VT_I4;
vt.lVal = CHILDID_SELF; vt.lVal = CHILDID_SELF;
pChild->lpVtbl->get_accRole(pChild, vt, &vt); pChild->get_accRole(vt, &vt);
if (vt.lVal == ROLE_SYSTEM_TOOLBAR) if (vt.lVal == ROLE_SYSTEM_TOOLBAR)
{ {
IAccessible* pLast = NULL; IAccessible* pLast = nullptr;
kk = 0; kk = 0;
pChild->lpVtbl->get_accChildCount(pChild, &kk); pChild->get_accChildCount(&kk);
if (kk <= 1) if (kk <= 1)
{ {
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, -1); SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, (HANDLE)-1);
} }
else if (kk >= 2) else if (kk >= 2)
{ {
vt.vt = VT_I4; vt.vt = VT_I4;
vt.lVal = kk - 1; vt.lVal = kk - 1;
long x = 0, y = 0, w = 0, h = 0, d = 0; long x = 0, y = 0, w = 0, h = 0, d = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt); pChild->accLocation(&x, &y, &w, &h, vt);
if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL)) if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL))
{ {
hr = E_FAIL; hr = E_FAIL;
@ -71,23 +75,23 @@ HRESULT TaskbarCenter_Center(HWND hWnd, HWND hWndTaskbar, RECT rc, BOOL bIsTaskb
vt.vt = VT_I4; vt.vt = VT_I4;
vt.lVal = 1; vt.lVal = 1;
x = 0, y = 0, w = 0, h = 0; x = 0, y = 0, w = 0, h = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt); pChild->accLocation(&x, &y, &w, &h, vt);
if (bIsTaskbarHorizontal ? w == 0 : h == 0) if (bIsTaskbarHorizontal ? w == 0 : h == 0)
{ {
vt.vt = VT_I4; vt.vt = VT_I4;
vt.lVal = 2; vt.lVal = 2;
x = 0, y = 0, w = 0, h = 0; x = 0, y = 0, w = 0, h = 0;
pChild->lpVtbl->accLocation(pChild, &x, &y, &w, &h, vt); pChild->accLocation(&x, &y, &w, &h, vt);
} }
if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL)) if (bIsTaskbarHorizontal ? (x == -1 || w < EP_TASKBAR_LENGTH_TOO_SMALL) : (y == -1 || h < EP_TASKBAR_LENGTH_TOO_SMALL))
{ {
hr == E_FAIL; hr = E_FAIL;
} }
else else
{ {
if (!((GetKeyState(VK_LBUTTON) < 0) && (GetForegroundWindow() == hWndTaskbar))) if (!((GetKeyState(VK_LBUTTON) < 0) && (GetForegroundWindow() == hWndTaskbar)))
{ {
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, (bIsTaskbarHorizontal ? (d - (x - rc.left)) : (d - (y - rc.top)))); SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, (HANDLE)(UINT_PTR)(bIsTaskbarHorizontal ? (d - (x - rc.left)) : (d - (y - rc.top))));
} }
} }
} }
@ -95,19 +99,19 @@ HRESULT TaskbarCenter_Center(HWND hWnd, HWND hWndTaskbar, RECT rc, BOOL bIsTaskb
{ {
if (!((GetKeyState(VK_LBUTTON) < 0) && (GetForegroundWindow() == hWndTaskbar))) if (!((GetKeyState(VK_LBUTTON) < 0) && (GetForegroundWindow() == hWndTaskbar)))
{ {
SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, bIsTaskbarHorizontal ? w : h); SetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME, (HANDLE)(UINT_PTR)(bIsTaskbarHorizontal ? w : h));
} }
} }
} }
} }
} }
pChild->lpVtbl->Release(pChild); pChild->Release();
} }
pDisp->lpVtbl->Release(pDisp); pDisp->Release();
} }
} }
} }
pAccessible->lpVtbl->Release(pAccessible); pAccessible->Release();
} }
return hr; return hr;
} }
@ -131,9 +135,9 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
{ {
return GetClientRect(hWnd, lpRect); // Early out return GetClientRect(hWnd, lpRect); // Early out
} }
HWND hWndStart = NULL; HWND hWndStart = nullptr;
RECT rcStart = { 0, 0, 0, 0 }; RECT rcStart = { 0, 0, 0, 0 };
HWND hWndTaskbar = NULL; HWND hWndTaskbar = nullptr;
if (bIsPrimaryTaskbar) if (bIsPrimaryTaskbar)
{ {
hWndTaskbar = GetParent(GetParent(hwndParent)); hWndTaskbar = GetParent(GetParent(hwndParent));
@ -142,12 +146,12 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
{ {
hWndTaskbar = GetParent(hwndParent); hWndTaskbar = GetParent(hwndParent);
} }
hWndStart = FindWindowExW(hWndTaskbar, NULL, L"Start", NULL); hWndStart = FindWindowExW(hWndTaskbar, nullptr, L"Start", nullptr);
BOOL bIsTaskbarHorizontal = TaskbarCenter_IsTaskbarHorizontal(hWnd); BOOL bIsTaskbarHorizontal = TaskbarCenter_IsTaskbarHorizontal(hWnd);
HWND hReBarWindow32 = NULL; HWND hReBarWindow32 = nullptr;
if (bIsPrimaryTaskbar) hReBarWindow32 = FindWindowExW(hWndTaskbar, NULL, L"ReBarWindow32", NULL); if (bIsPrimaryTaskbar) hReBarWindow32 = FindWindowExW(hWndTaskbar, nullptr, L"ReBarWindow32", nullptr);
HWND hPeopleBand = NULL; HWND hPeopleBand = nullptr;
if (bIsPrimaryTaskbar) hPeopleBand = FindWindowExW(hReBarWindow32, NULL, L"PeopleBand", NULL); if (bIsPrimaryTaskbar) hPeopleBand = FindWindowExW(hReBarWindow32, nullptr, L"PeopleBand", nullptr);
BOOL bIsWeatherAvailable = hPeopleBand && dwWeatherToLeft; BOOL bIsWeatherAvailable = hPeopleBand && dwWeatherToLeft;
BOOL bWasLeftAlignedDueToSpaceConstraints = FALSE; BOOL bWasLeftAlignedDueToSpaceConstraints = FALSE;
if (bCenteringEnabled) if (bCenteringEnabled)
@ -155,10 +159,10 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
if (hWndStart) if (hWndStart)
{ {
GetClientRect(hWndStart, &rcStart); GetClientRect(hWndStart, &rcStart);
HWND hTrayButton = NULL; HWND hTrayButton = nullptr;
wchar_t* pCn = L"TrayButton"; const wchar_t* pCn = L"TrayButton";
if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl"; if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl";
while (hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, NULL)) while ((hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, nullptr)))
{ {
if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue; if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue;
RECT rcTrayButton; RECT rcTrayButton;
@ -173,7 +177,7 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
} }
if (pCn == L"TrayDummySearchControl") { if (pCn == L"TrayDummySearchControl") {
pCn = L"TrayButton"; pCn = L"TrayButton";
hTrayButton = NULL; hTrayButton = nullptr;
} }
} }
} }
@ -183,9 +187,9 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
ZeroMemory(&mi, sizeof(MONITORINFO)); ZeroMemory(&mi, sizeof(MONITORINFO));
mi.cbSize = sizeof(MONITORINFO); mi.cbSize = sizeof(MONITORINFO);
GetMonitorInfoW(MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY), &mi); GetMonitorInfoW(MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY), &mi);
DWORD dwLength = 0; long dwLength = 0;
TaskbarCenter_Center(hWnd, hWndTaskbar, mi.rcMonitor, bIsTaskbarHorizontal); TaskbarCenter_Center(hWnd, hWndTaskbar, mi.rcMonitor, bIsTaskbarHorizontal);
if (dwLength = GetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME)) if ((dwLength = (long)(UINT_PTR)GetPropW(hWnd, EP_TASKBAR_LENGTH_PROP_NAME)))
{ {
if (dwLength == -1) if (dwLength == -1)
{ {
@ -193,49 +197,49 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
{ {
if (bIsTaskbarHorizontal) if (bIsTaskbarHorizontal)
{ {
SetWindowPos(hWndStart, NULL, ((mi.rcMonitor.right - mi.rcMonitor.left) - (rcStart.right - rcStart.left)) / 2, rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS); SetWindowPos(hWndStart, nullptr, ((mi.rcMonitor.right - mi.rcMonitor.left) - (rcStart.right - rcStart.left)) / 2, rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
RECT rcTrayButton; RECT rcTrayButton;
GetClientRect(hWndStart, &rcTrayButton); GetClientRect(hWndStart, &rcTrayButton);
DWORD dwDim = (rcTrayButton.right - rcTrayButton.left); DWORD dwDim = (rcTrayButton.right - rcTrayButton.left);
HWND hTrayButton = NULL; HWND hTrayButton = nullptr;
wchar_t* pCn = L"TrayButton"; const wchar_t* pCn = L"TrayButton";
if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl"; if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl";
while (hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, NULL)) while ((hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, nullptr)))
{ {
if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue; if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue;
GetClientRect(hTrayButton, &rcTrayButton); GetClientRect(hTrayButton, &rcTrayButton);
MoveWindow(hTrayButton, ((mi.rcMonitor.right - mi.rcMonitor.left) - (rcStart.right - rcStart.left)) / 2 + dwDim, rcStart.top, rcTrayButton.right, rcTrayButton.bottom, TRUE); MoveWindow(hTrayButton, ((mi.rcMonitor.right - mi.rcMonitor.left) - (rcStart.right - rcStart.left)) / 2 + dwDim, rcStart.top, rcTrayButton.right, rcTrayButton.bottom, TRUE);
if (!bIsPrimaryTaskbar) InvalidateRect(hTrayButton, NULL, TRUE); if (!bIsPrimaryTaskbar) InvalidateRect(hTrayButton, nullptr, TRUE);
dwDim += (rcTrayButton.right - rcTrayButton.left); dwDim += (rcTrayButton.right - rcTrayButton.left);
if (pCn == L"TrayDummySearchControl") { if (pCn == L"TrayDummySearchControl") {
pCn = L"TrayButton"; pCn = L"TrayButton";
hTrayButton = NULL; hTrayButton = nullptr;
} }
} }
} }
else else
{ {
SetWindowPos(hWndStart, NULL, rcStart.left, ((mi.rcMonitor.bottom - mi.rcMonitor.top) - (rcStart.bottom - rcStart.top)) / 2, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS); SetWindowPos(hWndStart, nullptr, rcStart.left, ((mi.rcMonitor.bottom - mi.rcMonitor.top) - (rcStart.bottom - rcStart.top)) / 2, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
RECT rcTrayButton; RECT rcTrayButton;
GetClientRect(hWndStart, &rcTrayButton); GetClientRect(hWndStart, &rcTrayButton);
DWORD dwDim = (rcTrayButton.bottom - rcTrayButton.top); DWORD dwDim = (rcTrayButton.bottom - rcTrayButton.top);
HWND hTrayButton = NULL; HWND hTrayButton = nullptr;
wchar_t* pCn = L"TrayButton"; const wchar_t* pCn = L"TrayButton";
if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl"; if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl";
while (hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, NULL)) while ((hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, nullptr)))
{ {
if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue; if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue;
GetClientRect(hTrayButton, &rcTrayButton); GetClientRect(hTrayButton, &rcTrayButton);
MoveWindow(hTrayButton, rcStart.left, ((mi.rcMonitor.bottom - mi.rcMonitor.top) - (rcStart.bottom - rcStart.top)) / 2 + dwDim, rcTrayButton.right, rcTrayButton.bottom, TRUE); MoveWindow(hTrayButton, rcStart.left, ((mi.rcMonitor.bottom - mi.rcMonitor.top) - (rcStart.bottom - rcStart.top)) / 2 + dwDim, rcTrayButton.right, rcTrayButton.bottom, TRUE);
InvalidateRect(hTrayButton, NULL, TRUE); InvalidateRect(hTrayButton, nullptr, TRUE);
dwDim += (rcTrayButton.bottom - rcTrayButton.top); dwDim += (rcTrayButton.bottom - rcTrayButton.top);
if (pCn == L"TrayDummySearchControl") { if (pCn == L"TrayDummySearchControl") {
pCn = L"TrayButton"; pCn = L"TrayButton";
hTrayButton = NULL; hTrayButton = nullptr;
} }
} }
} }
if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, NULL, TRUE); if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, nullptr, TRUE);
} }
} }
else else
@ -264,7 +268,7 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
// rc.left += mBand.cxLeftWidth; // rc.left += mBand.cxLeftWidth;
//} //}
DWORD dwAdd = 0; long dwAdd = 0;
if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart) if (TaskbarCenter_ShouldStartBeCentered(dwSetting) && hWndStart)
{ {
dwAdd += (bIsTaskbarHorizontal ? (rcStart.right - rcStart.left) : (rcStart.bottom - rcStart.top)); dwAdd += (bIsTaskbarHorizontal ? (rcStart.right - rcStart.left) : (rcStart.bottom - rcStart.top));
@ -333,49 +337,49 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
{ {
if (bIsTaskbarHorizontal) if (bIsTaskbarHorizontal)
{ {
SetWindowPos(hWndStart, NULL, (rc.left - mi.rcMonitor.left) + lpRect->left - (rcStart.right - rcStart.left), rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS); SetWindowPos(hWndStart, nullptr, (rc.left - mi.rcMonitor.left) + lpRect->left - (rcStart.right - rcStart.left), rcStart.top, 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
RECT rcTrayButton; RECT rcTrayButton;
GetClientRect(hWndStart, &rcTrayButton); GetClientRect(hWndStart, &rcTrayButton);
DWORD dwDim = (rcTrayButton.right - rcTrayButton.left); DWORD dwDim = (rcTrayButton.right - rcTrayButton.left);
HWND hTrayButton = NULL; HWND hTrayButton = nullptr;
wchar_t* pCn = L"TrayButton"; const wchar_t* pCn = L"TrayButton";
if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl"; if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl";
while (hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, NULL)) while ((hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, nullptr)))
{ {
if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue; if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue;
GetClientRect(hTrayButton, &rcTrayButton); GetClientRect(hTrayButton, &rcTrayButton);
MoveWindow(hTrayButton, (rc.left - mi.rcMonitor.left) + lpRect->left - (rcStart.right - rcStart.left) + dwDim, rcStart.top, rcTrayButton.right, rcTrayButton.bottom, TRUE); MoveWindow(hTrayButton, (rc.left - mi.rcMonitor.left) + lpRect->left - (rcStart.right - rcStart.left) + dwDim, rcStart.top, rcTrayButton.right, rcTrayButton.bottom, TRUE);
if (!bIsPrimaryTaskbar) InvalidateRect(hTrayButton, NULL, TRUE); if (!bIsPrimaryTaskbar) InvalidateRect(hTrayButton, nullptr, TRUE);
dwDim += (rcTrayButton.right - rcTrayButton.left); dwDim += (rcTrayButton.right - rcTrayButton.left);
if (pCn == L"TrayDummySearchControl") { if (pCn == L"TrayDummySearchControl") {
pCn = L"TrayButton"; pCn = L"TrayButton";
hTrayButton = NULL; hTrayButton = nullptr;
} }
} }
} }
else else
{ {
SetWindowPos(hWndStart, NULL, rcStart.left, (rc.top - mi.rcMonitor.top) + lpRect->top - (rcStart.bottom - rcStart.top), 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS); SetWindowPos(hWndStart, nullptr, rcStart.left, (rc.top - mi.rcMonitor.top) + lpRect->top - (rcStart.bottom - rcStart.top), 0, 0, SWP_NOSIZE | SWP_FRAMECHANGED | SWP_ASYNCWINDOWPOS);
RECT rcTrayButton; RECT rcTrayButton;
GetClientRect(hWndStart, &rcTrayButton); GetClientRect(hWndStart, &rcTrayButton);
DWORD dwDim = (rcTrayButton.bottom - rcTrayButton.top); DWORD dwDim = (rcTrayButton.bottom - rcTrayButton.top);
HWND hTrayButton = NULL; HWND hTrayButton = nullptr;
wchar_t* pCn = L"TrayButton"; const wchar_t* pCn = L"TrayButton";
if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl"; if (/*!IsWindows11() &&*/ dwSearchboxTaskbarMode == 2) pCn = L"TrayDummySearchControl";
while (hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, NULL)) while ((hTrayButton = FindWindowExW(hWndTaskbar, hTrayButton, pCn, nullptr)))
{ {
if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue; if (pCn == L"TrayButton" && !IsWindowVisible(hTrayButton)) continue;
GetClientRect(hTrayButton, &rcTrayButton); GetClientRect(hTrayButton, &rcTrayButton);
MoveWindow(hTrayButton, rcStart.left, (rc.top - mi.rcMonitor.top) + lpRect->top - (rcStart.bottom - rcStart.top) + dwDim, rcTrayButton.right, rcTrayButton.bottom, TRUE); MoveWindow(hTrayButton, rcStart.left, (rc.top - mi.rcMonitor.top) + lpRect->top - (rcStart.bottom - rcStart.top) + dwDim, rcTrayButton.right, rcTrayButton.bottom, TRUE);
InvalidateRect(hTrayButton, NULL, TRUE); InvalidateRect(hTrayButton, nullptr, TRUE);
dwDim += (rcTrayButton.bottom - rcTrayButton.top); dwDim += (rcTrayButton.bottom - rcTrayButton.top);
if (pCn == L"TrayDummySearchControl") { if (pCn == L"TrayDummySearchControl") {
pCn = L"TrayButton"; pCn = L"TrayButton";
hTrayButton = NULL; hTrayButton = nullptr;
} }
} }
} }
if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, NULL, TRUE); if (!bIsPrimaryTaskbar) InvalidateRect(hWndStart, nullptr, TRUE);
} }
} }
} }
@ -400,12 +404,12 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
ZeroMemory(&rbi, sizeof(REBARBANDINFOW)); ZeroMemory(&rbi, sizeof(REBARBANDINFOW));
rbi.cbSize = sizeof(REBARBANDINFOW); rbi.cbSize = sizeof(REBARBANDINFOW);
rbi.fMask = RBBIM_CHILD; rbi.fMask = RBBIM_CHILD;
SendMessageW(hReBarWindow32, RB_GETBANDINFOW, 0, &rbi); SendMessageW(hReBarWindow32, RB_GETBANDINFOW, 0, (LPARAM)&rbi);
BOOL bIsFirstBandPeopleBand = (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand); BOOL bIsFirstBandPeopleBand = (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand);
if (bWeatherAlignment ? !bIsFirstBandPeopleBand : bIsFirstBandPeopleBand) if (bWeatherAlignment ? !bIsFirstBandPeopleBand : bIsFirstBandPeopleBand)
{ {
int s = 0; int s = 0;
int k = SendMessageW(hReBarWindow32, RB_GETBANDCOUNT, 0, 0); int k = (int)SendMessageW(hReBarWindow32, RB_GETBANDCOUNT, 0, 0);
if (bWeatherAlignment) if (bWeatherAlignment)
{ {
for (int i = k - 1; i >= 0; i--) for (int i = k - 1; i >= 0; i--)
@ -415,7 +419,7 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
ZeroMemory(&rbi, sizeof(REBARBANDINFOW)); ZeroMemory(&rbi, sizeof(REBARBANDINFOW));
rbi.cbSize = sizeof(REBARBANDINFOW); rbi.cbSize = sizeof(REBARBANDINFOW);
rbi.fMask = RBBIM_CHILD; rbi.fMask = RBBIM_CHILD;
SendMessageW(hReBarWindow32, RB_GETBANDINFOW, i, &rbi); SendMessageW(hReBarWindow32, RB_GETBANDINFOW, i, (LPARAM)&rbi);
if (rbi.hwndChild && (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand)) if (rbi.hwndChild && (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand))
{ {
s = 1; s = 1;
@ -437,13 +441,13 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
SendNotifyMessageW(HWND_BROADCAST, WM_WININICHANGE, 0, (LPARAM)L"TraySettings"); SendNotifyMessageW(HWND_BROADCAST, WM_WININICHANGE, 0, (LPARAM)L"TraySettings");
} }
} }
int k = SendMessageW(hReBarWindow32, RB_GETBANDCOUNT, 0, 0); int k = (int)SendMessageW(hReBarWindow32, RB_GETBANDCOUNT, 0, 0);
for (int i = 0; i < k - 1; ++i) for (int i = 0; i < k - 1; ++i)
{ {
ZeroMemory(&rbi, sizeof(REBARBANDINFOW)); ZeroMemory(&rbi, sizeof(REBARBANDINFOW));
rbi.cbSize = sizeof(REBARBANDINFOW); rbi.cbSize = sizeof(REBARBANDINFOW);
rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE; rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE;
SendMessageW(hReBarWindow32, RB_GETBANDINFOW, i, &rbi); SendMessageW(hReBarWindow32, RB_GETBANDINFOW, i, (LPARAM)&rbi);
if (rbi.hwndChild && (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand)) if (rbi.hwndChild && (GetClassWord(rbi.hwndChild, GCW_ATOM) == atomPeopleBand))
{ {
RECT rcpp = { 0, 0, 0, 0 }; RECT rcpp = { 0, 0, 0, 0 };
@ -470,7 +474,7 @@ BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect)
BOOL TaskbarCenter_SHWindowsPolicy(REFIID riid) BOOL TaskbarCenter_SHWindowsPolicy(REFIID riid)
{ {
if (IsEqualIID(riid, &POLID_TurnOffSPIAnimations) && (TaskbarCenter_ShouldCenter(dwOldTaskbarAl) || TaskbarCenter_ShouldCenter(dwMMOldTaskbarAl))) if (IsEqualIID(riid, POLID_TurnOffSPIAnimations) && (TaskbarCenter_ShouldCenter(dwOldTaskbarAl) || TaskbarCenter_ShouldCenter(dwMMOldTaskbarAl)))
{ {
DWORD flOldProtect = 0; DWORD flOldProtect = 0;
if (!bTaskbarCenterHasPatchedSHWindowsPolicy && *((unsigned char*)_ReturnAddress() + 7) == 0x0F) if (!bTaskbarCenterHasPatchedSHWindowsPolicy && *((unsigned char*)_ReturnAddress() + 7) == 0x0F)
@ -492,3 +496,5 @@ BOOL TaskbarCenter_SHWindowsPolicy(REFIID riid)
} }
return SHWindowsPolicy(riid); return SHWindowsPolicy(riid);
} }
} // extern "C"

95
ExplorerPatcher/TaskbarCenter.h
Unescape View File

@ -1,5 +1,5 @@
#ifndef _H_TASKBARCENTER_H_ #pragma once
#define _H_TASKBARCENTER_H_
#include <initguid.h> #include <initguid.h>
#include <Windows.h> #include <Windows.h>
#include <oleacc.h> #include <oleacc.h>
@ -12,17 +12,91 @@
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MIN_DIM 600 #define MIN_DIM 600
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
interface ITaskGroup;
interface ITaskItem;
interface ITaskBtnGroup;
MIDL_INTERFACE("e587c396-8ac9-49b7-a16c-e2acfd140399")
ITaskListSite : IUnknown
{
virtual HRESULT STDMETHODCALLTYPE GetGroupLocation(ITaskGroup*, ITaskItem*, int, RECT*) = 0;
virtual DWORD STDMETHODCALLTYPE GetStuckPlace() const = 0;
virtual void STDMETHODCALLTYPE SwitchToItem(ITaskItem*) = 0;
virtual void STDMETHODCALLTYPE CloseItem(ITaskItem*) = 0;
virtual void STDMETHODCALLTYPE OnContextMenu(POINT, HWND, bool, ITaskGroup*, ITaskItem*) = 0;
virtual void STDMETHODCALLTYPE SetHotItem(ITaskItem*) = 0;
virtual void STDMETHODCALLTYPE HandleMouseEnter(int) = 0;
virtual void STDMETHODCALLTYPE HandleMouseLeave(int) = 0;
virtual void STDMETHODCALLTYPE NotifyExtendedUIDismissed(int, ITaskItem*) = 0;
virtual void STDMETHODCALLTYPE DisableToolTip(int) = 0;
virtual int STDMETHODCALLTYPE GetIconId(ITaskGroup*, ITaskItem*) = 0;
virtual int STDMETHODCALLTYPE IsContextMenuActive() = 0;
virtual HWND STDMETHODCALLTYPE GetWindow() = 0;
virtual HRESULT STDMETHODCALLTYPE ShowLivePreview(ITaskItem*, DWORD) = 0;
virtual int STDMETHODCALLTYPE IsLivePreviewActive() = 0;
virtual int STDMETHODCALLTYPE IsTaskTopLevelUI(ITaskItem*) = 0;
virtual int STDMETHODCALLTYPE IsTaskExtendedUI(ITaskBtnGroup*, ITaskItem*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetHost(const GUID&, void**) = 0;
};
MIDL_INTERFACE("391a8cab-898e-44bc-989d-30029294b3dd")
ITaskListWndSite : IUnknown
{
virtual void STDMETHODCALLTYPE CheckSize(int) = 0;
virtual HRESULT STDMETHODCALLTYPE GetStuckPlace(DWORD*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetTaskListUITheme(const WCHAR**) = 0;
virtual HRESULT STDMETHODCALLTYPE GetUserPreferences(DWORD*) = 0;
virtual int STDMETHODCALLTYPE HitTestForSizeableBorder(int, int) = 0;
virtual HRESULT STDMETHODCALLTYPE UnhideTray() = 0;
virtual HRESULT STDMETHODCALLTYPE SetScrollInfo(int, const SCROLLINFO&) = 0;
virtual HRESULT STDMETHODCALLTYPE GetScrollInfo(int, SCROLLINFO*) = 0;
virtual HRESULT STDMETHODCALLTYPE HandleScroll(int, UINT, int) = 0;
virtual int STDMETHODCALLTYPE IsHorizontal() = 0;
/*virtual int STDMETHODCALLTYPE IsFullHeightOfTray() = 0;
virtual void STDMETHODCALLTYPE UpdateTheme() = 0;
virtual SyncDisplayChangeFlags STDMETHODCALLTYPE SyncDisplayChange(SyncDisplayChangeFlags, CCoSimpleArray<UINT>&) = 0;
virtual void STDMETHODCALLTYPE ImmersiveShow() = 0;
virtual void STDMETHODCALLTYPE HandleImmersiveLauncherVisibilityChange(HMONITOR, bool) = 0;
virtual void STDMETHODCALLTYPE HandleSearchAppVisibilityChange(HMONITOR, bool) = 0;
virtual void STDMETHODCALLTYPE HandleTaskViewVisibilityChange(bool) = 0;
virtual bool STDMETHODCALLTYPE IsDesktopVisibleOnTrayMonitor() = 0;
virtual void STDMETHODCALLTYPE HandleJumpViewVisibilityChange(bool) = 0;
virtual void STDMETHODCALLTYPE HandleHoverUIVisibilityChange(bool) = 0;
virtual void STDMETHODCALLTYPE NotifyFeedsAboutTaskListUpdated() = 0;*/
};
inline BOOL TaskbarCenter_IsTaskbarHorizontal(HWND hWnd) inline BOOL TaskbarCenter_IsTaskbarHorizontal(HWND hWnd)
{ {
__int64 v1; BOOL bRet = FALSE;
__int64 result;
v1 = *((__int64*)GetWindowLongPtrW(hWnd, 0) + 13); void* pTaskListWnd = (void*)GetWindowLongPtrW(hWnd, 0);
result = 1i64; if (pTaskListWnd)
if (v1) {
return (*(__int64(__fastcall**)(__int64))(*(__int64*)v1 + 96))(v1); // Shift by sizeof(CImpWndProc)
return result; IUnknown* punkTaskListWnd = (IUnknown*)((PBYTE)pTaskListWnd + sizeof(void*) /*vtable*/ + sizeof(HWND) /*_hwnd*/);
ITaskListSite* pTaskListSite = nullptr;
if (SUCCEEDED(punkTaskListWnd->QueryInterface(IID_PPV_ARGS(&pTaskListSite))))
{
ITaskListWndSite* pHost = nullptr;
if (SUCCEEDED(pTaskListSite->GetHost(IID_PPV_ARGS(&pHost))))
{
bRet = pHost->IsHorizontal() != 0;
pHost->Release();
}
pTaskListSite->Release();
}
} }
return bRet;
}
#endif
inline BOOL TaskbarCenter_ShouldCenter(DWORD dwSetting) inline BOOL TaskbarCenter_ShouldCenter(DWORD dwSetting)
{ {
return (dwSetting & 0b001); return (dwSetting & 0b001);
@ -41,4 +115,7 @@ inline BOOL TaskbarCenter_ShouldLeftAlignWhenSpaceConstrained(DWORD dwSetting)
BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect); BOOL TaskbarCenter_GetClientRectHook(HWND hWnd, LPRECT lpRect);
BOOL TaskbarCenter_SHWindowsPolicy(REFIID riid); BOOL TaskbarCenter_SHWindowsPolicy(REFIID riid);
#ifdef __cplusplus
}
#endif #endif
Write Preview
Loading…
Cancel
Save