1
0
mirror of https://github.com/valinet/ExplorerPatcher.git synced 2024-11-23 23:21:08 +01:00

Setup: Unpack Windows.UI.ShellCommon only on builds without StartUI shipped

This commit is contained in:
Amrsatrio 2024-08-02 02:16:41 +07:00
parent c127c0573c
commit 3c50ea3c68
2 changed files with 4 additions and 2 deletions

View File

@ -41,6 +41,8 @@ With this update, ExplorerPatcher is now officially compatible and supported on
* Start10: Fixed positioning when the taskbar is not placed at the bottom, on 24H2 and latest 22H2/23H2 builds. (de2532d, ea5881f)
* Taskbar10: Fixed taskbar jump list flyout positioning when the taskbar is not placed at the bottom, on latest 22H2/23H2/24H2 builds. (39609e4)
* Setup: Updated the code for dealing with locked files, this should reduce the chances of getting setup failures due to locked files. (7e0f7eb)
* ep_taskbar: Fixed tray icons not being saved.
* ep_taskbar: Removed the Copilot button on 22H2.
**Important note:** Please include the following folders in your antivirus' exclusion list to prevent issues due to false positive detections:
* `C:\Program Files\ExplorerPatcher`

View File

@ -1343,6 +1343,7 @@ int WINAPI wWinMain(
}
}
DeleteResource(wszPath, L"Windows.UI.ShellCommon.pri");
BOOL bNoStartUIInThisBuild = ((global_rovi.dwBuildNumber >= 22621 && global_rovi.dwBuildNumber <= 22635) && global_ubr >= 3930) || global_rovi.dwBuildNumber >= 25169;
BOOL bNoPniduiInThisBuild = global_rovi.dwBuildNumber >= 25236;
if (bInstall)
{
@ -1351,7 +1352,7 @@ int WINAPI wWinMain(
{
if (bOk) bOk = ExtractDirectory(zipFile, "pnidui/", wszPath, languages, LCT_MUI);
}
if (IsWindows11Version22H2OrHigher())
if (bNoStartUIInThisBuild)
{
if (bOk) bOk = ExtractDirectory(zipFile, "Windows.UI.ShellCommon/", wszPath, languages, LCT_PRI);
}
@ -1440,7 +1441,6 @@ int WINAPI wWinMain(
bOk = CreateSymbolicLinkW(wszSymLinkPath, wszOrigPath, 0);
}
BOOL bNoStartUIInThisBuild = ((global_rovi.dwBuildNumber >= 22621 && global_rovi.dwBuildNumber <= 22635) && global_ubr >= 3930) || global_rovi.dwBuildNumber >= 25169;
if (bOk) bOk = InstallResource(bInstall && bNoStartUIInThisBuild, hInstance, zipFile, "StartUI/StartUI.dll", wszPath, L"StartUI_.dll");
// Delete remnants from earlier versions