Skip to content

Commit 3c50ea3

Browse files
committed
Setup: Unpack Windows.UI.ShellCommon only on builds without StartUI shipped
1 parent c127c05 commit 3c50ea3

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ With this update, ExplorerPatcher is now officially compatible and supported on
4141
* Start10: Fixed positioning when the taskbar is not placed at the bottom, on 24H2 and latest 22H2/23H2 builds. (de2532d, ea5881f)
4242
* Taskbar10: Fixed taskbar jump list flyout positioning when the taskbar is not placed at the bottom, on latest 22H2/23H2/24H2 builds. (39609e4)
4343
* Setup: Updated the code for dealing with locked files, this should reduce the chances of getting setup failures due to locked files. (7e0f7eb)
44+
* ep_taskbar: Fixed tray icons not being saved.
45+
* ep_taskbar: Removed the Copilot button on 22H2.
4446

4547
ℹ️ **Important note:** Please include the following folders in your antivirus' exclusion list to prevent issues due to false positive detections:
4648
* `C:\Program Files\ExplorerPatcher`

ep_setup/ep_setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1343,6 +1343,7 @@ int WINAPI wWinMain(
13431343
}
13441344
}
13451345
DeleteResource(wszPath, L"Windows.UI.ShellCommon.pri");
1346+
BOOL bNoStartUIInThisBuild = ((global_rovi.dwBuildNumber >= 22621 && global_rovi.dwBuildNumber <= 22635) && global_ubr >= 3930) || global_rovi.dwBuildNumber >= 25169;
13461347
BOOL bNoPniduiInThisBuild = global_rovi.dwBuildNumber >= 25236;
13471348
if (bInstall)
13481349
{
@@ -1351,7 +1352,7 @@ int WINAPI wWinMain(
13511352
{
13521353
if (bOk) bOk = ExtractDirectory(zipFile, "pnidui/", wszPath, languages, LCT_MUI);
13531354
}
1354-
if (IsWindows11Version22H2OrHigher())
1355+
if (bNoStartUIInThisBuild)
13551356
{
13561357
if (bOk) bOk = ExtractDirectory(zipFile, "Windows.UI.ShellCommon/", wszPath, languages, LCT_PRI);
13571358
}
@@ -1440,7 +1441,6 @@ int WINAPI wWinMain(
14401441
bOk = CreateSymbolicLinkW(wszSymLinkPath, wszOrigPath, 0);
14411442
}
14421443

1443-
BOOL bNoStartUIInThisBuild = ((global_rovi.dwBuildNumber >= 22621 && global_rovi.dwBuildNumber <= 22635) && global_ubr >= 3930) || global_rovi.dwBuildNumber >= 25169;
14441444
if (bOk) bOk = InstallResource(bInstall && bNoStartUIInThisBuild, hInstance, zipFile, "StartUI/StartUI.dll", wszPath, L"StartUI_.dll");
14451445

14461446
// Delete remnants from earlier versions

0 commit comments

Comments
 (0)