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

Update classic-taskbar-buttons-lite.wh.cpp #870

Merged
merged 2 commits into from
Aug 17, 2024
Merged

Update classic-taskbar-buttons-lite.wh.cpp #870

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98cb7a6
Update classic-taskbar-buttons-lite.wh.cpp
Anixx Aug 17, 2024
732888b
Update classic-taskbar-buttons-lite.wh.cpp
Anixx Aug 17, 2024
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
41 changes: 35 additions & 6 deletions mods/classic-taskbar-buttons-lite.wh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// @id classic-taskbar-buttons-lite
// @name Classic Taskbar 3D buttons Lite
// @description Lightweight mod, restoring the 3D buttons in classic theme
// @version 1.2
// @version 1.3
// @author Anixx
// @github https://github.com/Anixx
// @include explorer.exe
Expand Down Expand Up @@ -61,9 +61,6 @@ void CALCON CTaskBtnGroup__DrawBar_hook(
{
uState |= DFCS_PUSHED;
}

lprcDest->left++;
lprcDest->right--;

DrawFrameControl(
hDC,
Expand All @@ -86,11 +83,35 @@ void CALCON CTaskBtnGroup__DrawBar_hook(
return;
}


/* Add spacing between taskbar items */
typedef long (* CTaskBtnGroup_SetLocation_t)(void *, int, int, LPRECT);
CTaskBtnGroup_SetLocation_t CTaskBtnGroup_SetLocation_orig;
long __cdecl CTaskBtnGroup_SetLocation_hook(
void *pThis,
int i1,
int i2,
LPRECT lprc
)
{
APPBARDATA abd;
abd.cbSize = sizeof(APPBARDATA);
if (SHAppBarMessage(ABM_GETTASKBARPOS, &abd))
{
if (abd.uEdge == ABE_BOTTOM || abd.uEdge == ABE_TOP)
{
lprc->right -= 2;
}
}

return CTaskBtnGroup_SetLocation_orig(pThis, i1, i2, lprc);
}

BOOL Wh_ModInit(void)
{
HMODULE hExplorer = GetModuleHandleW(NULL);

WindhawkUtils::SYMBOL_HOOK hooks[] = {
WindhawkUtils::SYMBOL_HOOK explorerExeHooks[] = {
{
{
L"private: void "
Expand All @@ -101,10 +122,18 @@ BOOL Wh_ModInit(void)
(void *)CTaskBtnGroup__DrawBar_hook,
FALSE
},
{
{
L"public: virtual long __cdecl CTaskBtnGroup::SetLocation(int,int,struct tagRECT const *)"
},
(void **)&CTaskBtnGroup_SetLocation_orig,
(void*)CTaskBtnGroup_SetLocation_hook,
FALSE
}

};

if (!WindhawkUtils::HookSymbols(hExplorer, hooks, ARRAYSIZE(hooks)))
if (!WindhawkUtils::HookSymbols(hExplorer, explorerExeHooks, ARRAYSIZE(explorerExeHooks)))
{
Wh_Log(L"Failed to hook one or more functions");
return FALSE;
Expand Down