GUI: Add option for ep_taskbar in Windows 10

Amrsatrio · Amrsatrio · commit aec8c7036fb9 · 2024-12-11T06:39:31.000+07:00
diff --git a/ep_gui/GUI.c b/ep_gui/GUI.c
@@ -1171,8 +1171,6 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                 else if (!_stricmp(funcName, "!IsOldTaskbar") && GUI_GetTaskbarStyle(TRUE) != 0) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "IsStockWin10Taskbar") && GUI_GetTaskbarStyle(TRUE) != 1) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "IsAltImplTaskbar") && GUI_GetTaskbarStyle(TRUE) <= 1) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "DoesTaskbarDllExist") && !DoesTaskbarDllExist()) bSkipLines = TRUE;
-                else if (!_stricmp(funcName, "!DoesTaskbarDllExist") && DoesTaskbarDllExist()) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "!IsStockWindows10TaskbarAvailable") && !(!IsStockWindows10TaskbarAvailable() && GUI_GetTaskbarStyle(FALSE) == 1)) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "IsWindows10StartMenu") && (!DoesWindows10StartMenuExist() || (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1)))) bSkipLines = TRUE;
                 else if (!_stricmp(funcName, "!IsWindows10StartMenu") && (DoesWindows10StartMenuExist() && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1)))) bSkipLines = TRUE;
@@ -2516,7 +2514,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                                 bShouldAlterTaskbarDa = TRUE;
                             }
                         }
-                        if (!wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_TaskbarPosition") || !wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_MMTaskbarPosition"))
+                        else if (!wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_TaskbarPosition") || !wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_MMTaskbarPosition"))
                         {
                             if (GUI_TaskbarStyle == 0)
                             {
@@ -2541,6 +2539,22 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                                 RemoveMenu(hMenu, 3, MF_BYCOMMAND);
                             }
                         }
+                        else if (!wcscmp(name, L"OldTaskbar"))
+                        {
+                            if (!DoesTaskbarDllExist())
+                            {
+                                MENUITEMINFOA menuInfo;
+                                ZeroMemory(&menuInfo, sizeof(MENUITEMINFOA));
+                                menuInfo.cbSize = sizeof(MENUITEMINFOA);
+                                menuInfo.fMask = MIIM_DATA;
+                                GetMenuItemInfoA(hMenu, 3, FALSE, &menuInfo);
+                                if (menuInfo.dwItemData)
+                                {
+                                    free(menuInfo.dwItemData);
+                                }
+                                RemoveMenu(hMenu, 3, MF_BYCOMMAND);
+                            }
+                        }
                         HKEY hKey = NULL;
                         wchar_t* matchHKLM = wcsstr(section, L"HKEY_LOCAL_MACHINE");
                         BOOL bIsHKLM = matchHKLM && (matchHKLM - section) < 3;
@@ -2618,6 +2632,10 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)
                             {
                                 GUI_TaskbarStyle = value;
                                 AdjustTaskbarStyleValue(&GUI_TaskbarStyle);
+                                if (value >= 2 && !DoesTaskbarDllExist())
+                                {
+                                    value = 0;
+                                }
                             }
                             if (hDC && bInvert)
                             {
diff --git a/ep_gui/resources/settings.reg b/ep_gui/resources/settings.reg
@@ -5,21 +5,12 @@
 ;q
 
 ;T %R:1001%
-;s Taskbar_StyleSection1 DoesTaskbarDllExist
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
 ;z 3 %R:1002% *
 ;x 0 %R:1003%
 ;x 1 %R:1004%
 ;x 2 %R:1047%
 "OldTaskbar"=dword:00000001
-;g Taskbar_StyleSection1
-;s Taskbar_StyleSection2 !DoesTaskbarDllExist
-[HKEY_CURRENT_USER\Software\ExplorerPatcher]
-;z 2 %R:1002% *
-;x 0 %R:1003%
-;x 1 %R:1004%
-"OldTaskbar"=dword:00000001
-;g Taskbar_StyleSection2
 ;s Taskbar_StockWin10Unavailable !IsStockWindows10TaskbarAvailable
 ;t ⚠ %R:1049%
 ;g Taskbar_StockWin10Unavailable
diff --git a/ep_gui/resources/settings10.reg b/ep_gui/resources/settings10.reg
@@ -6,6 +6,10 @@
 
 ;T %R:1001%
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]
+;z 2 %R:1002% *
+;x 0 %R:1404%
+;x 2 %R:1047%
+"OldTaskbar"=dword:00000000
 ;y %R:1005% 🡕
 ;ms-settings:taskbar
 ;y %R:1006% 🡕
@@ -74,6 +78,10 @@
 ;x 1 %R:1045%
 ;x 0 %R:1046%
 "TaskbarSmallIcons"=dword:00000000
+;s Taskbar_AltImplSection IsAltImplTaskbar
+;y %R:1048%
+;https://github.com/valinet/ExplorerPatcher/wiki/ExplorerPatcher's-taskbar-implementation
+;g Taskbar_AltImplSection
 
 ;T %R:1101%
 [HKEY_CURRENT_USER\Software\ExplorerPatcher]

Original file line number	Diff line number	Diff line change
`@@ -1171,8 +1171,6 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)`
`1171`	`1171`	`else if (!_stricmp(funcName, "!IsOldTaskbar") && GUI_GetTaskbarStyle(TRUE) != 0) bSkipLines = TRUE;`
`1172`	`1172`	`else if (!_stricmp(funcName, "IsStockWin10Taskbar") && GUI_GetTaskbarStyle(TRUE) != 1) bSkipLines = TRUE;`
`1173`	`1173`	`else if (!_stricmp(funcName, "IsAltImplTaskbar") && GUI_GetTaskbarStyle(TRUE) <= 1) bSkipLines = TRUE;`
`1174`		`- else if (!_stricmp(funcName, "DoesTaskbarDllExist") && !DoesTaskbarDllExist()) bSkipLines = TRUE;`
`1175`		`- else if (!_stricmp(funcName, "!DoesTaskbarDllExist") && DoesTaskbarDllExist()) bSkipLines = TRUE;`
`1176`	`1174`	`else if (!_stricmp(funcName, "!IsStockWindows10TaskbarAvailable") && !(!IsStockWindows10TaskbarAvailable() && GUI_GetTaskbarStyle(FALSE) == 1)) bSkipLines = TRUE;`
`1177`	`1175`	`else if (!_stricmp(funcName, "IsWindows10StartMenu") && (!DoesWindows10StartMenuExist() \|\| (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes != 1)))) bSkipLines = TRUE;`
`1178`	`1176`	`else if (!_stricmp(funcName, "!IsWindows10StartMenu") && (DoesWindows10StartMenuExist() && (dwRes = 0, RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"Start_ShowClassicMode", RRF_RT_DWORD, NULL, &dwRes, &dwSize), (dwRes == 1)))) bSkipLines = TRUE;`
`@@ -2516,7 +2514,7 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)`
`2516`	`2514`	`bShouldAlterTaskbarDa = TRUE;`
`2517`	`2515`	`}`
`2518`	`2516`	`}`
`2519`		`- if (!wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_TaskbarPosition") \|\| !wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_MMTaskbarPosition"))`
	`2517`	`+ else if (!wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_TaskbarPosition") \|\| !wcscmp(name, L"Virtualized_" _T(EP_CLSID) L"_MMTaskbarPosition"))`
`2520`	`2518`	`{`
`2521`	`2519`	`if (GUI_TaskbarStyle == 0)`
`2522`	`2520`	`{`
`@@ -2541,6 +2539,22 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)`
`2541`	`2539`	`RemoveMenu(hMenu, 3, MF_BYCOMMAND);`
`2542`	`2540`	`}`
`2543`	`2541`	`}`
	`2542`	`+ else if (!wcscmp(name, L"OldTaskbar"))`
	`2543`	`+ {`
	`2544`	`+ if (!DoesTaskbarDllExist())`
	`2545`	`+ {`
	`2546`	`+ MENUITEMINFOA menuInfo;`
	`2547`	`+ ZeroMemory(&menuInfo, sizeof(MENUITEMINFOA));`
	`2548`	`+ menuInfo.cbSize = sizeof(MENUITEMINFOA);`
	`2549`	`+ menuInfo.fMask = MIIM_DATA;`
	`2550`	`+ GetMenuItemInfoA(hMenu, 3, FALSE, &menuInfo);`
	`2551`	`+ if (menuInfo.dwItemData)`
	`2552`	`+ {`
	`2553`	`+ free(menuInfo.dwItemData);`
	`2554`	`+ }`
	`2555`	`+ RemoveMenu(hMenu, 3, MF_BYCOMMAND);`
	`2556`	`+ }`
	`2557`	`+ }`
`2544`	`2558`	`HKEY hKey = NULL;`
`2545`	`2559`	`wchar_t* matchHKLM = wcsstr(section, L"HKEY_LOCAL_MACHINE");`
`2546`	`2560`	`BOOL bIsHKLM = matchHKLM && (matchHKLM - section) < 3;`
`@@ -2618,6 +2632,10 @@ static BOOL GUI_Build(HDC hDC, HWND hwnd, POINT pt)`
`2618`	`2632`	`{`
`2619`	`2633`	`GUI_TaskbarStyle = value;`
`2620`	`2634`	`AdjustTaskbarStyleValue(&GUI_TaskbarStyle);`
	`2635`	`+ if (value >= 2 && !DoesTaskbarDllExist())`
	`2636`	`+ {`
	`2637`	`+ value = 0;`
	`2638`	`+ }`
`2621`	`2639`	`}`
`2622`	`2640`	`if (hDC && bInvert)`
`2623`	`2641`	`{`