diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd40911cb..8699cd0ff 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,6 +85,14 @@ jobs:
- name: Restore NuGet packages
run: |
nuget restore ExplorerPatcher.sln
+
+ - name: Download ep_taskbar
+ uses: robinraju/release-downloader@v1
+ with:
+ repository: ExplorerPatcher/ep_taskbar_releases
+ fileName: ep_taskbar.*.dll
+ latest: true
+ outputDir: build/Release
- name: Build funchook
shell: powershell
diff --git a/ExplorerPatcher/ExplorerPatcher.vcxproj b/ExplorerPatcher/ExplorerPatcher.vcxproj
index cbad6c562..b2d90270d 100644
--- a/ExplorerPatcher/ExplorerPatcher.vcxproj
+++ b/ExplorerPatcher/ExplorerPatcher.vcxproj
@@ -24,7 +24,6 @@
CenterTitlebarTextLibrary
10.0
ExplorerPatcher
- 0
@@ -91,11 +90,6 @@
ExplorerPatcher.IA-32
$(SolutionDir)\build\$(Configuration)\
-
-
- WITH_ALT_TASKBAR_IMPL=1;%(PreprocessorDefinitions)
-
-
Level3
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 5dd58e76d..15dcd0e95 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -11868,7 +11868,6 @@ BOOL CrashCounterHandleEntryPoint()
#pragma region "Loader for alternate taskbar implementation"
#ifdef _WIN64
-#if WITH_ALT_TASKBAR_IMPL
BOOL CheckExplorerSymbols(symbols_addr* symbols_PTRS)
{
BOOL bAllValid = TRUE;
@@ -11955,7 +11954,6 @@ HMODULE PrepareAlternateTaskbarImplementation(symbols_addr* symbols_PTRS, const
return hMyTaskbar;
}
#endif
-#endif
#pragma endregion
@@ -12446,11 +12444,7 @@ DWORD Inject(BOOL bIsExplorer)
#endif
}
-#if WITH_ALT_TASKBAR_IMPL
const WCHAR* pszTaskbarDll = GetTaskbarDllChecked(&symbols_PTRS);
-#else
- const WCHAR* pszTaskbarDll = NULL;
-#endif
if (bOldTaskbar >= 2 && !pszTaskbarDll)
{
bOldTaskbar = 1;
@@ -12808,9 +12802,7 @@ DWORD Inject(BOOL bIsExplorer)
#endif
VnPatchIAT(hTwinuiPcshell, "API-MS-WIN-CORE-REGISTRY-L1-1-0.DLL", "RegGetValueW", twinuipcshell_RegGetValueW);
-#if WITH_ALT_TASKBAR_IMPL
HMODULE hMyTaskbar = PrepareAlternateTaskbarImplementation(&symbols_PTRS, pszTaskbarDll);
-#endif
printf("Setup twinui.pcshell functions done\n");
@@ -13196,10 +13188,8 @@ DWORD Inject(BOOL bIsExplorer)
VnPatchDelayIAT(hExplorer, "ext-ms-win-rtcore-ntuser-window-ext-l1-1-0.dll", "GetClientRect", TaskbarCenter_GetClientRectHook);
-#if WITH_ALT_TASKBAR_IMPL
if (hMyTaskbar)
VnPatchIAT(hMyTaskbar, "USER32.dll", "GetClientRect", TaskbarCenter_GetClientRectHook);
-#endif
VnPatchIAT(hExplorer, "SHCORE.dll", (LPCSTR)190, TaskbarCenter_SHWindowsPolicy);
printf("Initialized taskbar centering module.\n");
diff --git a/ExplorerPatcher/utility.h b/ExplorerPatcher/utility.h
index 100327b91..671e127dd 100644
--- a/ExplorerPatcher/utility.h
+++ b/ExplorerPatcher/utility.h
@@ -32,10 +32,6 @@
#define WM_MSG_GUI_SECTION WM_USER + 1
#define WM_MSG_GUI_SECTION_GET 1
-#ifndef WITH_ALT_TASKBAR_IMPL
-#define WITH_ALT_TASKBAR_IMPL 0
-#endif
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -695,7 +691,6 @@ inline BOOL IsStockWindows10TaskbarAvailable()
return global_rovi.dwBuildNumber < 26002;
}
-#if WITH_ALT_TASKBAR_IMPL
inline const WCHAR* PickTaskbarDll()
{
DWORD b = global_rovi.dwBuildNumber;
@@ -737,12 +732,6 @@ inline BOOL DoesTaskbarDllExist()
wcscat_s(szPath, MAX_PATH, pszTaskbarDll);
return FileExistsW(szPath);
}
-#else
-inline BOOL DoesTaskbarDllExist()
-{
- return FALSE;
-}
-#endif
inline void AdjustTaskbarStyleValue(DWORD* pdwValue)
{
diff --git a/ep_setup/ep_setup.c b/ep_setup/ep_setup.c
index ceef45776..d05c670e7 100644
--- a/ep_setup/ep_setup.c
+++ b/ep_setup/ep_setup.c
@@ -457,13 +457,11 @@ BOOL DownloadResource(BOOL bInstall, LPCWSTR pwszURL, DWORD dwSize, LPCSTR chash
void ProcessTaskbarDlls(BOOL* bInOutOk, BOOL bInstall, BOOL bExtractMode, HINSTANCE hInstance, WCHAR wszPath[260])
{
-#if WITH_ALT_TASKBAR_IMPL
LPCWSTR pwszTaskbarDllName = bExtractMode ? NULL : PickTaskbarDll();
if (*bInOutOk) *bInOutOk = InstallResource(bInstall && (bExtractMode || pwszTaskbarDllName && !wcscmp(pwszTaskbarDllName, L"ep_taskbar.2.dll")), hInstance, IDR_EP_TASKBAR_2, wszPath, L"ep_taskbar.2.dll");
if (*bInOutOk) *bInOutOk = InstallResource(bInstall && (bExtractMode || pwszTaskbarDllName && !wcscmp(pwszTaskbarDllName, L"ep_taskbar.3.dll")), hInstance, IDR_EP_TASKBAR_3, wszPath, L"ep_taskbar.3.dll");
if (*bInOutOk) *bInOutOk = InstallResource(bInstall && (bExtractMode || pwszTaskbarDllName && !wcscmp(pwszTaskbarDllName, L"ep_taskbar.4.dll")), hInstance, IDR_EP_TASKBAR_4, wszPath, L"ep_taskbar.4.dll");
if (*bInOutOk) *bInOutOk = InstallResource(bInstall && (bExtractMode || pwszTaskbarDllName && !wcscmp(pwszTaskbarDllName, L"ep_taskbar.5.dll")), hInstance, IDR_EP_TASKBAR_5, wszPath, L"ep_taskbar.5.dll");
-#endif
}
int WINAPI wWinMain(
diff --git a/ep_setup/ep_setup.vcxproj b/ep_setup/ep_setup.vcxproj
index 0efd94f5f..a296fa898 100644
--- a/ep_setup/ep_setup.vcxproj
+++ b/ep_setup/ep_setup.vcxproj
@@ -24,7 +24,6 @@
{2fd40b09-f224-4e9a-b2fe-a22b50b2debf}
epsetup
10.0
- 0
@@ -87,14 +86,6 @@
false
$(SolutionDir)\build\$(Configuration)\
-
-
- WITH_ALT_TASKBAR_IMPL=1;%(PreprocessorDefinitions)
-
-
- WITH_ALT_TASKBAR_IMPL=1;%(PreprocessorDefinitions)
-
-
Level3
diff --git a/ep_setup/resources/ep_setup.rc b/ep_setup/resources/ep_setup.rc
index abb201517..c8261ed2d 100644
--- a/ep_setup/resources/ep_setup.rc
+++ b/ep_setup/resources/ep_setup.rc
@@ -106,9 +106,6 @@ IDR_EP_STARTMENU RCDATA "..\\build\\Release\\ep_startmenu.dll
IDR_EP_GUI RCDATA "..\\build\\Release\\ep_gui.dll"
-#ifdef WITH_ALT_TASKBAR_IMPL
-#if WITH_ALT_TASKBAR_IMPL
-
#if EP_TASKBAR_2_EXISTS
IDR_EP_TASKBAR_2 RCDATA "..\\build\\Release\\ep_taskbar.2.dll"
#endif
@@ -125,9 +122,6 @@ IDR_EP_TASKBAR_4 RCDATA "..\\build\\Release\\ep_taskbar.4.dll
IDR_EP_TASKBAR_5 RCDATA "..\\build\\Release\\ep_taskbar.5.dll"
#endif
-#endif
-#endif
-
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////