From fe76eb62ba5111bbac5f9b4dbe0e04d1e5c3c5d8 Mon Sep 17 00:00:00 2001
From: abbodi1406 <33669284+abbodi1406@users.noreply.github.com>
Date: Sat, 28 Jun 2025 02:43:12 +0300
Subject: [PATCH] 20250627

---
 W10MUI/Updates/W10UI.cmd                      | 36 ++++++++++++----
 W10UI/README.md                               |  3 ++
 W10UI/W10UI.cmd                               | 36 ++++++++++++----
 esd-decrypter-wimlib/decrypt.cmd              |  1 +
 uup-converter-wimlib/convert-UUP.cmd          | 41 ++++++++++++++-----
 .../create_virtual_editions.cmd               |  2 +-
 6 files changed, 94 insertions(+), 25 deletions(-)

diff --git a/W10MUI/Updates/W10UI.cmd b/W10MUI/Updates/W10UI.cmd
index 028f24f..d78e8e8 100644
--- a/W10MUI/Updates/W10UI.cmd
+++ b/W10MUI/Updates/W10UI.cmd
@@ -1,5 +1,5 @@
 @setlocal DisableDelayedExpansion
-@set uiv=v10.52
+@set uiv=v10.53
 @echo off
 :: enable debug mode, you must also set target and repo (if updates are not beside the script)
 set _Debug=0
@@ -119,6 +119,8 @@ start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" %*"
 exit /b
 )
 
+set u_msulcu=0
+set u_winre=0
 set _offdu=0
 set _embd=0
 set _keep=0
@@ -311,6 +313,8 @@ if "%AddDrivers%"=="" set AddDrivers=0
 if "%Drv_Source%"=="" set "Drv_Source=\Drivers"
 if "%wim2esd%"=="" set wim2esd=0
 if "%wim2swm%"=="" set wim2swm=0
+set u_msulcu=%LCUmsuExpand%
+set u_winre=%LCUwinre%
 set _wimlib=
 set _wlib=0
 for %%# in (wimlib-imagex.exe) do @if not "%%~$PATH:#"=="" (
@@ -650,6 +654,12 @@ Delete_Source
 ) do (
 if !%%#! neq 0 set _configured=1
 )
+for %%# in (
+u_msulcu
+u_winre
+) do (
+if !%%#! neq 0 set _configured=1
+)
 if /i not "!dismroot!"=="dism.exe" set _configured=1
 if %_embd% equ 0 if %_configured% equ 1 (
 echo.
@@ -661,10 +671,10 @@ echo.
   echo Net35
   if not "!Net35Source!"=="" echo Net35Source
   )
+  if %u_msulcu% neq 0 (echo LCUmsuExpand %u_msulcu%) else (if %LCUmsuExpand% neq 0 echo LCUmsuExpand %LCUmsuExpand%)
   for %%# in (
   Cleanup
   ResetBase
-  LCUmsuExpand
   UpdtBootFiles
   SkipEdge
   SkipWebView
@@ -677,7 +687,7 @@ echo.
   if %wimfiles%==1 (
   if %WimCreateTime% neq 0 echo WimCreateTime
   if %WinRE% neq 0 echo WinRE
-  if %LCUwinre% neq 0 echo LCUwinre
+  if %u_winre% neq 0 (echo LCUwinre %u_winre%) else (if %LCUwinre% neq 0 echo LCUwinre %LCUwinre%)
   )
   if %dvd%==1 (
   if %wim2esd% neq 0 echo wim2esd
@@ -1287,6 +1297,10 @@ if not exist "!_cabdir!\LCUmum\Package_for_RollupFix~%_Pkt%~%sss%~~%cver%.mum" c
 call :vrpad %kbvr%
 if %_build% geq 26052 (
 if not exist "!_cabdir!\LCUall\%cuvr%-!package!" copy /y "!repo!\!package!" "!_cabdir!\LCUall\%cuvr%-!package!" %_Nul1%
+echo !package! |findstr /i "KB5043080" %_Nul1% && if not exist "!_cabdir!\LCUbase\%cuvr%-!package!" (
+  mkdir "!_cabdir!\LCUbase" %_Nul3%
+  copy /y "!repo!\!package!" "!_cabdir!\LCUbase\%cuvr%-!package!" %_Nul1%
+  )
 )
 if %kbvr% geq %c_ver% (
 set "c_ver=%kbvr%"
@@ -1600,7 +1614,9 @@ call :dNUL !errorlevel!
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_winre.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_winre.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 )
 :cuboot
@@ -1615,7 +1631,9 @@ call :dNUL !errorlevel!
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_boot.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_boot.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 )
 :cuinstall
@@ -1630,7 +1648,9 @@ if %online% equ 0 if %ResetBase% equ 2 if %_build% geq 26052 if !_c_! lss %c_num
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 call set /a _c_+=1
 if %online% equ 0 if %ResetBase% equ 2 if %_build% geq 26052 if !_c_! lss %c_num% call :rebase
@@ -2300,7 +2320,9 @@ if defined netmsu if defined netxtr (
 )
 if defined netmsu for %%# in (%netmsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:!ppath!
 )
 if not defined netmsu if defined netlcu (
 %_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package %netroll% %netlcu%
diff --git a/W10UI/README.md b/W10UI/README.md
index dd3daad..8422d21 100644
--- a/W10UI/README.md
+++ b/W10UI/README.md
@@ -234,6 +234,9 @@ special thanks for testing and feedback:
 
 <details><summary>changelog</summary>
 
+10.53:  
+- Add workaround to avoid KB5043080 msu installation error
+
 10.52:  
 - Fixed WimCreateTime option when "Keep indexes: Selected"
 
diff --git a/W10UI/W10UI.cmd b/W10UI/W10UI.cmd
index 028f24f..d78e8e8 100644
--- a/W10UI/W10UI.cmd
+++ b/W10UI/W10UI.cmd
@@ -1,5 +1,5 @@
 @setlocal DisableDelayedExpansion
-@set uiv=v10.52
+@set uiv=v10.53
 @echo off
 :: enable debug mode, you must also set target and repo (if updates are not beside the script)
 set _Debug=0
@@ -119,6 +119,8 @@ start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" %*"
 exit /b
 )
 
+set u_msulcu=0
+set u_winre=0
 set _offdu=0
 set _embd=0
 set _keep=0
@@ -311,6 +313,8 @@ if "%AddDrivers%"=="" set AddDrivers=0
 if "%Drv_Source%"=="" set "Drv_Source=\Drivers"
 if "%wim2esd%"=="" set wim2esd=0
 if "%wim2swm%"=="" set wim2swm=0
+set u_msulcu=%LCUmsuExpand%
+set u_winre=%LCUwinre%
 set _wimlib=
 set _wlib=0
 for %%# in (wimlib-imagex.exe) do @if not "%%~$PATH:#"=="" (
@@ -650,6 +654,12 @@ Delete_Source
 ) do (
 if !%%#! neq 0 set _configured=1
 )
+for %%# in (
+u_msulcu
+u_winre
+) do (
+if !%%#! neq 0 set _configured=1
+)
 if /i not "!dismroot!"=="dism.exe" set _configured=1
 if %_embd% equ 0 if %_configured% equ 1 (
 echo.
@@ -661,10 +671,10 @@ echo.
   echo Net35
   if not "!Net35Source!"=="" echo Net35Source
   )
+  if %u_msulcu% neq 0 (echo LCUmsuExpand %u_msulcu%) else (if %LCUmsuExpand% neq 0 echo LCUmsuExpand %LCUmsuExpand%)
   for %%# in (
   Cleanup
   ResetBase
-  LCUmsuExpand
   UpdtBootFiles
   SkipEdge
   SkipWebView
@@ -677,7 +687,7 @@ echo.
   if %wimfiles%==1 (
   if %WimCreateTime% neq 0 echo WimCreateTime
   if %WinRE% neq 0 echo WinRE
-  if %LCUwinre% neq 0 echo LCUwinre
+  if %u_winre% neq 0 (echo LCUwinre %u_winre%) else (if %LCUwinre% neq 0 echo LCUwinre %LCUwinre%)
   )
   if %dvd%==1 (
   if %wim2esd% neq 0 echo wim2esd
@@ -1287,6 +1297,10 @@ if not exist "!_cabdir!\LCUmum\Package_for_RollupFix~%_Pkt%~%sss%~~%cver%.mum" c
 call :vrpad %kbvr%
 if %_build% geq 26052 (
 if not exist "!_cabdir!\LCUall\%cuvr%-!package!" copy /y "!repo!\!package!" "!_cabdir!\LCUall\%cuvr%-!package!" %_Nul1%
+echo !package! |findstr /i "KB5043080" %_Nul1% && if not exist "!_cabdir!\LCUbase\%cuvr%-!package!" (
+  mkdir "!_cabdir!\LCUbase" %_Nul3%
+  copy /y "!repo!\!package!" "!_cabdir!\LCUbase\%cuvr%-!package!" %_Nul1%
+  )
 )
 if %kbvr% geq %c_ver% (
 set "c_ver=%kbvr%"
@@ -1600,7 +1614,9 @@ call :dNUL !errorlevel!
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_winre.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_winre.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 )
 :cuboot
@@ -1615,7 +1631,9 @@ call :dNUL !errorlevel!
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_boot.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU_boot.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 )
 :cuinstall
@@ -1630,7 +1648,9 @@ if %online% equ 0 if %ResetBase% equ 2 if %_build% geq 26052 if !_c_! lss %c_num
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismLCU.log" /Add-Package /PackagePath:!ppath!
 call :dNUL !errorlevel!
 call set /a _c_+=1
 if %online% equ 0 if %ResetBase% equ 2 if %_build% geq 26052 if !_c_! lss %c_num% call :rebase
@@ -2300,7 +2320,9 @@ if defined netmsu if defined netxtr (
 )
 if defined netmsu for %%# in (%netmsu%) do (
 echo.&echo %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:!ppath!
 )
 if not defined netmsu if defined netlcu (
 %_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package %netroll% %netlcu%
diff --git a/esd-decrypter-wimlib/decrypt.cmd b/esd-decrypter-wimlib/decrypt.cmd
index a19ce72..0f7627d 100644
--- a/esd-decrypter-wimlib/decrypt.cmd
+++ b/esd-decrypter-wimlib/decrypt.cmd
@@ -727,6 +727,7 @@ rmdir /s /q bin\temp\
 
 set _rfr=refresh
 set _rsr=release_svc_%_rfr%
+if %revver%==26100.4349 (set _label=26100.4349.250607-1500.ge_%_rsr%&set branch=ge_%_rsr%&set ISOnameESD=0)
 if %revver%==26100.2033 (set _label=26100.2033.241004-2336.ge_%_rsr%&set branch=ge_%_rsr%&set ISOnameESD=0)
 if %revver%==26100.1742 (set _label=26100.1742.240909-0928.ge_%_rsr%&set branch=ge_%_rsr%&set ISOnameESD=0)
 if %revmaj%==22631 (set _label=%revver%.%_time%.23h2_ni_%_rsr%&set branch=23h2_ni_%_rsr%)
diff --git a/uup-converter-wimlib/convert-UUP.cmd b/uup-converter-wimlib/convert-UUP.cmd
index 03acb3b..55d5ea3 100644
--- a/uup-converter-wimlib/convert-UUP.cmd
+++ b/uup-converter-wimlib/convert-UUP.cmd
@@ -1,6 +1,6 @@
 <!-- : Begin batch script
 @setlocal DisableDelayedExpansion
-@set uivr=v112
+@set uivr=v113
 @echo off
 :: Change to 1 to enable debug mode
 set _Debug=0
@@ -351,6 +351,9 @@ if %_Debug% neq 0 (
 if %AutoStart% equ 0 set AutoStart=2
 )
 set _configured=0
+set u_msulcu=%LCUmsuExpand%
+set u_winre=%LCUwinre%
+set u_upgrade=%DisableUpdatingUpgrade%
 if exist bin\temp\ rmdir /s /q bin\temp\
 if exist temp\ rmdir /s /q temp\
 if exist bin\expand.exe if not exist bin\dpx.dll del /f /q bin\expand.exe
@@ -619,6 +622,13 @@ DeleteSource
 ) do (
 if !%%#! neq 0 set _configured=1
 )
+for %%# in (
+u_msulcu
+u_winre
+u_upgrade
+) do (
+if !%%#! neq 0 set _configured=1
+)
 if %_configured% equ 1 (
 call :dk_color1 %Blue% "=== Configured Options . . ." 4 5
   if %AutoStart% neq 0 echo AutoStart %AutoStart%
@@ -626,9 +636,9 @@ call :dk_color1 %Blue% "=== Configured Options . . ." 4 5
   if %AddUpdates% equ 1 (
   if %Cleanup% neq 0 echo Cleanup
   if %Cleanup% neq 0 if %ResetBase% neq 0 echo ResetBase
-  if %LCUwinre% neq 0 echo LCUwinre
-  if %LCUmsuExpand% neq 0 echo LCUmsuExpand
-  if %DisableUpdatingUpgrade% neq 0 echo DisableUpdatingUpgrade
+  if %u_winre% neq 0 (echo LCUwinre %u_winre%) else (if %LCUwinre% neq 0 echo LCUwinre %LCUwinre%)
+  if %u_msulcu% neq 0 (echo LCUmsuExpand %u_msulcu%) else (if %LCUmsuExpand% neq 0 echo LCUmsuExpand %LCUmsuExpand%)
+  if %u_upgrade% neq 0 (echo DisableUpdatingUpgrade %u_upgrade%) else (if %DisableUpdatingUpgrade% neq 0 echo DisableUpdatingUpgrade %DisableUpdatingUpgrade%)
   )
   if %AddUpdates% neq 0 if %NetFx3% neq 0 echo NetFx3
   if %StartVirtual% neq 0 (
@@ -823,9 +833,9 @@ call :dk_color1 %Blue% "=== Configured Options . . ." 4 5
   echo AddUpdates %AddUpdates%
   if %Cleanup% neq 0 echo Cleanup
   if %Cleanup% neq 0 if %ResetBase% neq 0 echo ResetBase
-  if %LCUwinre% neq 0 echo LCUwinre
-  if %LCUmsuExpand% neq 0 echo LCUmsuExpand
-  if %DisableUpdatingUpgrade% neq 0 echo DisableUpdatingUpgrade
+  if %u_winre% neq 0 (echo LCUwinre %u_winre%) else (if %LCUwinre% neq 0 echo LCUwinre %LCUwinre%)
+  if %u_msulcu% neq 0 (echo LCUmsuExpand %u_msulcu%) else (if %LCUmsuExpand% neq 0 echo LCUmsuExpand %LCUmsuExpand%)
+  if %u_upgrade% neq 0 (echo DisableUpdatingUpgrade %u_upgrade%) else (if %DisableUpdatingUpgrade% neq 0 echo DisableUpdatingUpgrade %DisableUpdatingUpgrade%)
   )
   for %%# in (
   SkipWinRE
@@ -2556,6 +2566,10 @@ if not exist "!_cabdir!\LCUmum\Package_for_RollupFix~%_Pkt%~%_ss%~~%cver%.mum" c
 call :vrpad %kbvr%
 if %_build% geq 26052 (
 if not exist "!_cabdir!\LCUall\%cuvr%-%package%" copy /y "!_UUP!\%package%" "!_cabdir!\LCUall\%cuvr%-%package%" %_Nul1%
+echo %package% |findstr /i "KB5043080" %_Nul1% && if not exist "!_cabdir!\LCUbase\%cuvr%-%package%" (
+  mkdir "!_cabdir!\LCUbase" %_Nul3%
+  copy /y "!_UUP!\%package%" "!_cabdir!\LCUbase\%cuvr%-%package%" %_Nul1%
+  )
 )
 if %kbvr% geq %c_ver% (
 set "c_ver=%kbvr%"
@@ -2856,7 +2870,9 @@ if not exist "%mumtarget%\Windows\Servicing\Packages\*WinPE-LanguagePack*.mum" i
 )
 if defined lcumsu for %%# in (%lcumsu%) do (
 call :dk_color1 %_Yellow% "=== Adding LCU %%~nx#" 4
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\%_DsmLog%" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\%_DsmLog%" /Add-Package /PackagePath:!ppath!
 call set /a _c_+=1
 if not exist "%mumtarget%\Windows\Servicing\Packages\*WinPE-LanguagePack*.mum" if %ResetBase% equ 2 if %_build% geq 26052 if !_c_! lss %c_num% call :rebase
 )
@@ -3903,7 +3919,9 @@ if defined netmsu if defined netxtr (
 )
 if defined netmsu for %%# in (%netmsu%) do (
 echo.&echo Reinstalling %%~nx#
-%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:%%#
+set ppath=%%#
+if exist "!_cabdir!\LCUbase\%%~nx#" set ppath="!_cabdir!\LCUbase\%%~nx#"
+%_dism2%:"!_cabdir!" %dismtarget% /LogPath:"%_dLog%\DismNetFx3.log" /Add-Package /PackagePath:!ppath!
 call set ERRTEMP=!ERRORLEVEL!
 )
 if not defined netmsu if defined netlcu (
@@ -4327,6 +4345,9 @@ set _extVirt=0
 set _didProf=0
 set _didProN=0
 set _didHome=0
+set u_msulcu=0
+set u_winre=0
+set u_upgrade=0
 goto :eof
 
 :checkadk
@@ -4390,7 +4411,7 @@ exit /b
 :pr_color
 set _NCS=1
 if %winbuild% LSS 10586 set _NCS=0
-if %winbuild% GEQ 10586 reg.exe query HKCU\Console /v ForceV2 %_Nul2% | find /i "0x0" %_Null% && (set _NCS=0)
+if %winbuild% GEQ 10586 reg.exe query HKCU\Console /v ForceV2 2>nul | find /i "0x0" %_Null% && (set _NCS=0)
 
 if %_NCS% EQU 1 (
 for /F %%a in ('echo prompt $E ^| cmd.exe') do set "_esc=%%a"
diff --git a/uup-converter-wimlib/create_virtual_editions.cmd b/uup-converter-wimlib/create_virtual_editions.cmd
index 55f3cf7..a2304a0 100644
--- a/uup-converter-wimlib/create_virtual_editions.cmd
+++ b/uup-converter-wimlib/create_virtual_editions.cmd
@@ -1208,7 +1208,7 @@ goto :eof
 :pr_color
 set _NCS=1
 if %winbuild% LSS 10586 set _NCS=0
-if %winbuild% GEQ 10586 reg.exe query HKCU\Console /v ForceV2 %_Nul2% | find /i "0x0" %_Null% && (set _NCS=0)
+if %winbuild% GEQ 10586 reg.exe query HKCU\Console /v ForceV2 2>nul | find /i "0x0" %_Null% && (set _NCS=0)
 
 if %_NCS% EQU 1 (
 for /F %%a in ('echo prompt $E ^| cmd.exe') do set "_esc=%%a"