Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Taskbar Labels for Windows 11 v1.3.3 #1298

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Taskbar Labels for Windows 11 v1.3.3 #1298

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 109 additions & 68 deletions mods/taskbar-labels.wh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @id taskbar-labels
// @name Taskbar Labels for Windows 11
// @description Customize text labels and combining for running programs on the taskbar (Windows 11 only)
// @version 1.3.2
// @version 1.3.3
// @author m417z
// @github https://github.com/m417z
// @twitter https://twitter.com/m417z
Expand Down Expand Up @@ -278,16 +278,12 @@ FrameworkElement FindChildByClassName(FrameworkElement element,
}

HWND GetTaskbarWnd() {
static HWND hTaskbarWnd;
HWND hTaskbarWnd = FindWindow(L"Shell_TrayWnd", nullptr);

if (!hTaskbarWnd) {
HWND hWnd = FindWindow(L"Shell_TrayWnd", nullptr);

DWORD processId = 0;
if (hWnd && GetWindowThreadProcessId(hWnd, &processId) &&
processId == GetCurrentProcessId()) {
hTaskbarWnd = hWnd;
}
DWORD processId = 0;
if (!hTaskbarWnd || !GetWindowThreadProcessId(hTaskbarWnd, &processId) ||
processId != GetCurrentProcessId()) {
return nullptr;
}

return hTaskbarWnd;
Expand Down Expand Up @@ -382,6 +378,8 @@ void RecalculateLabels() {
g_applyingSettings = false;
}

void* TaskbarSettings_GroupingMode_Original;

using TaskListButton_get_IsRunning_t = HRESULT(WINAPI*)(void* pThis,
bool* running);
TaskListButton_get_IsRunning_t TaskListButton_get_IsRunning_Original;
Expand Down Expand Up @@ -1035,18 +1033,21 @@ void UpdateTaskListButtonWithLabelStyle(

double minWidth = 0;

if (indicatorStyle == IndicatorStyle::centerFixed) {
// Without this, the indicator isn't centered.
minWidth = indicatorElement.Width();
} else if (indicatorStyle == IndicatorStyle::centerDynamic) {
if (firstColumnWidthPixels > 0) {
minWidth = indicatorElement.Width() * taskListButtonWidth /
firstColumnWidthPixels;
}
} else if (indicatorStyle == IndicatorStyle::fullWidth) {
minWidth = taskListButtonWidth - 6;
if (minWidth < 0) {
minWidth = 0;
double indicatorElementWidth = indicatorElement.Width();
if (indicatorElementWidth > 0) {
if (indicatorStyle == IndicatorStyle::centerFixed) {
// Without this, the indicator isn't centered.
minWidth = indicatorElementWidth;
} else if (indicatorStyle == IndicatorStyle::centerDynamic) {
if (firstColumnWidthPixels > 0) {
minWidth = indicatorElementWidth * taskListButtonWidth /
firstColumnWidthPixels;
}
} else if (indicatorStyle == IndicatorStyle::fullWidth) {
minWidth = taskListButtonWidth - 6;
if (minWidth < 0) {
minWidth = 0;
}
}
}

Expand All @@ -1058,11 +1059,13 @@ void UpdateTaskListButtonWithLabelStyle(
double currentMinWidth = indicatorElement.MinWidth();
if (minWidth != currentMinWidth) {
indicatorElement.MinWidth(0);
indicatorElement.Dispatcher().TryRunAsync(
winrt::Windows::UI::Core::CoreDispatcherPriority::High,
[indicatorElement, minWidth]() {
indicatorElement.MinWidth(minWidth);
});
if (minWidth > 0) {
indicatorElement.Dispatcher().TryRunAsync(
winrt::Windows::UI::Core::CoreDispatcherPriority::High,
[indicatorElement, minWidth]() {
indicatorElement.MinWidth(minWidth);
});
}
}
} else {
indicatorElement.MinWidth(minWidth);
Expand Down Expand Up @@ -1387,36 +1390,6 @@ void WINAPI TaskListButton_Icon_Hook(void* pThis, LONG_PTR randomAccessStream) {
}
}

using TaskbarSettings_GroupingMode_t = DWORD(WINAPI*)(void* pThis);
TaskbarSettings_GroupingMode_t TaskbarSettings_GroupingMode_Original;
DWORD WINAPI TaskbarSettings_GroupingMode_Hook(void* pThis) {
Wh_Log(L">");

DWORD ret = TaskbarSettings_GroupingMode_Original(pThis);

if (!g_unloading) {
// 0 - Always
// 1 - When taskbar is full
// 2 - Never
if (g_settings.mode == Mode::noLabelsWithCombining ||
g_settings.mode == Mode::labelsWithCombining) {
ret = 0;
} else if (ret == 0) {
ret = 2;
}
}

if (g_overrideGroupingMode) {
if (ret == 0) {
ret = 2;
} else {
ret = 0;
}
}

return ret;
}

using ITaskbarButton_get_MinScalableWidth_t = HRESULT(WINAPI*)(void* pThis,
float* minWidth);
ITaskbarButton_get_MinScalableWidth_t
Expand All @@ -1430,8 +1403,8 @@ HRESULT ITaskbarButton_get_MinScalableWidth_Hook(void* pThis, float* minWidth) {
*minWidth > 0) {
// Allow to create many taskbar items before overflow appears.
int minimumTaskbarItemWidth = g_settings.minimumTaskbarItemWidth;
if (minimumTaskbarItemWidth < 44) {
minimumTaskbarItemWidth = 44;
if (minimumTaskbarItemWidth < 1) {
minimumTaskbarItemWidth = 1;
Wh_Log(L"minimumTaskbarItemWidth too small, using %d",
minimumTaskbarItemWidth);
}
Expand Down Expand Up @@ -1622,6 +1595,67 @@ TaskListGroupViewModel_ITaskbarAppItemViewModel_get_HasLabel_Hook(
return ret;
}

using RegGetValueW_t = decltype(&RegGetValueW);
RegGetValueW_t RegGetValueW_Original;
LONG WINAPI RegGetValueW_Hook(HKEY hkey,
LPCWSTR lpSubKey,
LPCWSTR lpValue,
DWORD dwFlags,
LPDWORD pdwType,
PVOID pvData,
LPDWORD pcbData) {
LONG ret = RegGetValueW_Original(hkey, lpSubKey, lpValue, dwFlags, pdwType,
pvData, pcbData);

if (hkey == HKEY_CURRENT_USER && lpSubKey &&
_wcsicmp(
lpSubKey,
LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced)") ==
0 &&
lpValue &&
(_wcsicmp(lpValue, L"TaskbarGlomLevel") == 0 ||
_wcsicmp(lpValue, L"MMTaskbarGlomLevel") == 0) &&
dwFlags == RRF_RT_REG_DWORD && pvData && pcbData &&
*pcbData == sizeof(DWORD)) {
Wh_Log(L">");

DWORD taskbarGlomLevel = (ret = ERROR_SUCCESS) ? *(DWORD*)pvData : 0;
DWORD taskbarGlomLevelOriginal = taskbarGlomLevel;

if (!g_unloading) {
// 0 - Always
// 1 - When taskbar is full
// 2 - Never
if (g_settings.mode == Mode::noLabelsWithCombining ||
g_settings.mode == Mode::labelsWithCombining) {
taskbarGlomLevel = 0;
} else if (taskbarGlomLevel == 0) {
taskbarGlomLevel = 2;
}
}

if (g_overrideGroupingMode) {
if (taskbarGlomLevel == 0) {
taskbarGlomLevel = 2;
} else {
taskbarGlomLevel = 0;
}
}

Wh_Log(L"Overriding TaskbarGlomLevel: %u->%u", taskbarGlomLevelOriginal,
taskbarGlomLevel);
*(DWORD*)pvData = taskbarGlomLevel;

if (pdwType) {
*pdwType = REG_DWORD;
}

ret = ERROR_SUCCESS;
}

return ret;
}

void* wil_Feature_GetImpl_Original;

using WilFeatureTraits_Feature_29785186_IsEnabled_t =
Expand Down Expand Up @@ -2142,6 +2176,15 @@ bool HookTaskbarViewDllSymbols(HMODULE module) {
// Taskbar.View.dll, ExplorerExtensions.dll
SYMBOL_HOOK symbolHooks[] = //
{
{
{
LR"(public: __cdecl winrt::impl::consume_WindowsUdk_UI_Shell_ITaskbarSettings5<struct winrt::WindowsUdk::UI::Shell::TaskbarSettings>::GroupingMode(void)const )",
LR"(public: __cdecl winrt::impl::consume_WindowsUdk_UI_Shell_ITaskbarSettings5<struct winrt::WindowsUdk::UI::Shell::TaskbarSettings>::GroupingMode(void)const __ptr64)",
},
(void**)&TaskbarSettings_GroupingMode_Original,
nullptr,
true,
},
{
{
LR"(public: virtual int __cdecl winrt::impl::produce<struct winrt::Taskbar::implementation::TaskListButton,struct winrt::Taskbar::ITaskListButton>::get_IsRunning(bool *))",
Expand Down Expand Up @@ -2189,15 +2232,6 @@ bool HookTaskbarViewDllSymbols(HMODULE module) {
(void**)&TaskListButton_Icon_Original,
(void*)TaskListButton_Icon_Hook,
},
{
{
LR"(public: __cdecl winrt::impl::consume_WindowsUdk_UI_Shell_ITaskbarSettings5<struct winrt::WindowsUdk::UI::Shell::TaskbarSettings>::GroupingMode(void)const )",
LR"(public: __cdecl winrt::impl::consume_WindowsUdk_UI_Shell_ITaskbarSettings5<struct winrt::WindowsUdk::UI::Shell::TaskbarSettings>::GroupingMode(void)const __ptr64)",
},
(void**)&TaskbarSettings_GroupingMode_Original,
(void*)TaskbarSettings_GroupingMode_Hook,
true,
},
{
{
LR"(public: virtual int __cdecl winrt::impl::produce<struct winrt::Taskbar::implementation::TaskListButton,struct winrt::Taskbar::ITaskbarButton>::get_MinScalableWidth(float *))",
Expand Down Expand Up @@ -2380,6 +2414,13 @@ BOOL ModInitWithTaskbarView(HMODULE taskbarViewModule) {
if (!HookTaskbarDllSymbols()) {
return FALSE;
}
} else {
HMODULE kernelBaseModule = GetModuleHandle(L"kernelbase.dll");
FARPROC pKernelBaseRegGetValueW =
GetProcAddress(kernelBaseModule, "RegGetValueW");
Wh_SetFunctionHook((void*)pKernelBaseRegGetValueW,
(void*)RegGetValueW_Hook,
(void**)&RegGetValueW_Original);
}

return TRUE;
Expand Down
Loading