Cool_Tools/ExplorerPatcher
1
0
Fork 0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2024-11-23 23:21:08 +01:00
Code Releases Wiki Activity

Taskbar10: Turn off the code for loading the reimplemented taskbar on public builds for now

Browse Source
This commit is contained in:
Amrsatrio 2024-02-21 09:40:06 +07:00
parent 08dec82aec
commit 9f9acfc74e
4 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ExplorerPatcher/dllmain.c
View File

@ -11895,6 +11895,7 @@ BOOL CrashCounterHandleEntryPoint()
#pragma region "Loader for alternate taskbar implementation" #pragma region "Loader for alternate taskbar implementation"
#ifdef _WIN64 #ifdef _WIN64
#if WITH_ALT_TASKBAR_IMPL
BOOL CheckExplorerSymbols(symbols_addr* symbols_PTRS) BOOL CheckExplorerSymbols(symbols_addr* symbols_PTRS)
{ {
BOOL bAllValid = TRUE; BOOL bAllValid = TRUE;
@ -11979,6 +11980,7 @@ void PrepareAlternateTaskbarImplementation(symbols_addr* symbols_PTRS, const WCH
wprintf(L"[TB] Using '%s'\n", pszTaskbarDll); wprintf(L"[TB] Using '%s'\n", pszTaskbarDll);
} }
#endif #endif
#endif
#pragma endregion #pragma endregion
@ -12385,7 +12387,11 @@ DWORD Inject(BOOL bIsExplorer)
} }
} }
#if WITH_ALT_TASKBAR_IMPL
const WCHAR* pszTaskbarDll = GetTaskbarDllChecked(&symbols_PTRS); const WCHAR* pszTaskbarDll = GetTaskbarDllChecked(&symbols_PTRS);
#else
const WCHAR* pszTaskbarDll = NULL;
#endif
if (bOldTaskbar >= 2 && !pszTaskbarDll) if (bOldTaskbar >= 2 && !pszTaskbarDll)
{ {
bOldTaskbar = 1; bOldTaskbar = 1;
@ -12731,7 +12737,9 @@ DWORD Inject(BOOL bIsExplorer)
#endif #endif
VnPatchIAT(hTwinuiPcshell, "API-MS-WIN-CORE-REGISTRY-L1-1-0.DLL", "RegGetValueW", twinuipcshell_RegGetValueW); VnPatchIAT(hTwinuiPcshell, "API-MS-WIN-CORE-REGISTRY-L1-1-0.DLL", "RegGetValueW", twinuipcshell_RegGetValueW);
#if WITH_ALT_TASKBAR_IMPL
PrepareAlternateTaskbarImplementation(&symbols_PTRS, pszTaskbarDll); PrepareAlternateTaskbarImplementation(&symbols_PTRS, pszTaskbarDll);
#endif
printf("Setup twinui.pcshell functions done\n"); printf("Setup twinui.pcshell functions done\n");

11
ExplorerPatcher/utility.h
View File

@ -32,6 +32,10 @@
#define WM_MSG_GUI_SECTION WM_USER + 1 #define WM_MSG_GUI_SECTION WM_USER + 1
#define WM_MSG_GUI_SECTION_GET 1 #define WM_MSG_GUI_SECTION_GET 1
#ifndef WITH_ALT_TASKBAR_IMPL
#define WITH_ALT_TASKBAR_IMPL 0
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -693,6 +697,7 @@ inline BOOL DoesWindows10StartMenuExist()
return FileExistsW(szPath); return FileExistsW(szPath);
} }
#if WITH_ALT_TASKBAR_IMPL
inline const WCHAR* PickTaskbarDll() inline const WCHAR* PickTaskbarDll()
{ {
DWORD b = global_rovi.dwBuildNumber; DWORD b = global_rovi.dwBuildNumber;
@ -734,6 +739,12 @@ inline BOOL DoesTaskbarDllExist()
wcscat_s(szPath, MAX_PATH, pszTaskbarDll); wcscat_s(szPath, MAX_PATH, pszTaskbarDll);
return FileExistsW(szPath); return FileExistsW(szPath);
} }
#else
inline BOOL DoesTaskbarDllExist()
{
return FALSE;
}
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }

2
ep_setup/ep_setup.c
View File

@ -442,11 +442,13 @@ BOOL DownloadResource(BOOL bInstall, LPCWSTR pwszURL, DWORD dwSize, LPCSTR chash
void ProcessTaskbarDlls(BOOL* bInOutOk, BOOL bInstall, BOOL bExtractMode, HINSTANCE hInstance, WCHAR wszPath[260]) void ProcessTaskbarDlls(BOOL* bInOutOk, BOOL bInstall, BOOL bExtractMode, HINSTANCE hInstance, WCHAR wszPath[260])
{ {
#if WITH_ALT_TASKBAR_IMPL
LPCWSTR pwszTaskbarDllName = bExtractMode ? NULL : PickTaskbarDll(); 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.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.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.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"); 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( int WINAPI wWinMain(

6
ep_setup/resources/ep_setup.rc
View File

@ -106,6 +106,9 @@ IDR_EP_STARTMENU RCDATA "..\\build\\Release\\ep_startmenu.dll
IDR_EP_GUI RCDATA "..\\build\\Release\\ep_gui.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 #if EP_TASKBAR_2_EXISTS
IDR_EP_TASKBAR_2 RCDATA "..\\build\\Release\\ep_taskbar.2.dll" IDR_EP_TASKBAR_2 RCDATA "..\\build\\Release\\ep_taskbar.2.dll"
#endif #endif
@ -122,6 +125,9 @@ IDR_EP_TASKBAR_4 RCDATA "..\\build\\Release\\ep_taskbar.4.dll
IDR_EP_TASKBAR_5 RCDATA "..\\build\\Release\\ep_taskbar.5.dll" IDR_EP_TASKBAR_5 RCDATA "..\\build\\Release\\ep_taskbar.5.dll"
#endif #endif
#endif
#endif
#endif // English (United States) resources #endif // English (United States) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////