Restore 3D taskbar buttons

[Anixx]

This Windhawk mod restores the 3D taskbar buttons in Win10 taskbar.

It would be great if the idea could be implemented in EP as well.

// ==WindhawkMod==
// @id              classic-taskbar-fix-lite
// @name            Classic Taskbar Fix Lite
// @description     Fixes the taskbar items in classic theme in a lite way
// @version         1.1.1
// @author          aubymori, Anixx
// @github          https://github.com/aubymori
// @include         explorer.exe
// @architecture    x86-64
// @compilerOptions -lgdi32
// ==/WindhawkMod==

// ==WindhawkModReadme==
/*
# Classic Taskbar Fix
Fixes the taskbar items in classic theme!
*/
// ==/WindhawkModReadme==

#include <windhawk_utils.h>


typedef struct tagBUTTONRENDERINFOSTATES {
    char data[12];
} BUTTONRENDERINFOSTATES, *PBUTTONRENDERINFOSTATES;

/* Remove clock hover effect */
typedef void (* GDIHelpers_FillRectARGB_t)(HDC, LPCRECT, BYTE, DWORD, bool);
GDIHelpers_FillRectARGB_t GDIHelpers_FillRectARGB_orig;
void __cdecl GDIHelpers_FillRectARGB_hook(
    HDC     hDC,
    LPCRECT lprc,
    BYTE    btUnknown,
    DWORD   dwUnknown,
    bool    bUnknown
)
{
    return;
}

/* Draw taskbar item */
typedef void (* CTaskBtnGroup__DrawBar_t)(void *, HDC, void *, void *);
CTaskBtnGroup__DrawBar_t CTaskBtnGroup__DrawBar_orig;
void __cdecl CTaskBtnGroup__DrawBar_hook(
    void *pThis,
    HDC   hDC,
    void *pRenderInfo,
    PBUTTONRENDERINFOSTATES pRenderStates
)
{
    LPRECT lprcDest = (LPRECT)((char *)pRenderInfo + 4);

    UINT uState = DFCS_BUTTONPUSH;
    if (pRenderStates->data[2])
    {
        uState |= DFCS_CHECKED;
    }
    else if (pRenderStates->data[4])
    {
        uState |= DFCS_PUSHED;
    }

    DrawFrameControl(
        hDC,
        lprcDest,
        DFC_BUTTON,
        uState
    );

    /* If button is pushed in, offset the rect for the icon and text draw */
    if (pRenderStates->data[2]
    ||  pRenderStates->data[4])
    {
        lprcDest->top++;
        lprcDest->bottom++;
        lprcDest->left++;
        lprcDest->right++;
    }

    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 ab;
    ab.cbSize=sizeof(APPBARDATA);
    if(SHAppBarMessage(ABM_GETTASKBARPOS, &ab)) {
        if ((ab.uEdge==ABE_BOTTOM)||(ab.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[] = {
        {
            {
                L"void __cdecl GDIHelpers::FillRectARGB(struct HDC__ *,struct tagRECT const *,unsigned char,unsigned long,bool)"
            },
            (void **)&GDIHelpers_FillRectARGB_orig,
            (void *)GDIHelpers_FillRectARGB_hook,
            FALSE
        },
        {
            {
                L"private: void __cdecl CTaskBtnGroup::_DrawBar(struct HDC__ *,struct BUTTONRENDERINFO const &,struct BUTTONRENDERINFOSTATES const &)"
            },
            (void **)&CTaskBtnGroup__DrawBar_orig,
            (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)))
    {
        Wh_Log(L"Failed to hook one or more functions");
        return FALSE;
    }

    return TRUE;
}

[pyrates999]

So install windhawk and enable that mod instead.

[Amrsatrio]

What if I say coming in a future EP update where the Windows 10 taskbar is reimplemented in EP 😳 I mean Microsoft has been getting rid of the code in Canary builds

[pyrates999]

That be nice. But I would consider that an enhancement after the major bugs have been fixed.

This says to me to stay off of windows 11 and just wait to see if MS does it right with windows 12.

[Anixx]

Was not the taskbar already re-written several times from Win95 to Win10?
If so, it seem the last one, for Win11 is the most problematic. They removed a lot of features, from taskbar labels to taskbar positioning. Are they re-implementing it using XAML?

[Amrsatrio]

Yes and they just couldn't do it properly. I used it for a year since 22000.51 came out and I had enough with it.

I compared 22621.1992's Win10 taskbar code and it differs a LOT than WinXP. Well some interfaces are still 95% the same but the rest are just different/refactored.

[Anixx]

One can restore the 3D border by adding and removing the WS_CAPTION. I think it can be fixed for Classic theme. Just add the background and fix fonts, like in the ClassicThemeMitigations.

[Anixx]

Okay, I reached this:

[Amrsatrio]

Bumping this post. EP 66.7 now has CTaskBtnGroup etc. functions exported. You can look at how @/m417z modified his mods to support EP's taskbar.