DISMTools 0.5 Preview 5

.github/workflows/create-nightly-installer.yaml

@@ -0,0 +1,35 @@
+name: Create Nightly Installer
+
+on:
+  push:
+    branches:
+      - stable
+      - dt_pre*
+      - dt_rel*
+env:
+  ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+
+jobs:
+  build-runspace:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref }}
+    - name: Set up MSBuild
+      uses: warrenbuckley/Setup-MSBuild@v1
+    - name: Prepare NuGet packages
+      run: .\nugetpkgprep.bat
+      continue-on-error: false
+    - name: Generate installer
+      run: |
+        $solutionDir = "$((Get-Location).Path)\"
+        $projectDir = "$((Get-Location).Path)\"
+        $targetDir = (Get-Location).Path + "\bin\Debug\"
+        msbuild Tools\UnpEax\UnpEax.csproj /p:Configuration=Debug /p:DeployOnBuild=true
+        msbuild DISMTools.vbproj /p:Configuration=Debug /p:DeployOnBuild=true /p:SolutionDir=$solutionDir /p:ProjectDir=$projectDir /p:TargetDir=$targetDir
+    - name: Push nightly installer
+      uses: stefanzweifel/git-auto-commit-action@v5
+      with:
+        commit_message: DISMTools Nightly Installer
+      if: success()

Actions/Actions.MainForm.vb

@@ -147,15 +147,15 @@ Public Class Actions_MainForm
             Next
         End If
         StatusStrip.BackColor = MainForm.StatusStrip.BackColor
-        InitScintilla("Courier New", 10)
+        InitScintilla("Consolas", 11)
         If MainForm.IsWindowsVersionOrGreater(10, 0, 18362) Then MainForm.EnableDarkTitleBar(Handle, MainForm.BackColor = Color.FromArgb(48, 48, 48))
         ' Fill in font combinations
         FontFamilyTSCB.Items.Clear()
         For Each fntFamily As FontFamily In FontFamily.Families
             FontFamilyTSCB.Items.Add(fntFamily.Name)
         Next
-        FontFamilyTSCB.SelectedItem = "Courier New"
-        InitScintilla("Courier New", 10)
+        FontFamilyTSCB.SelectedItem = "Consolas"
+        InitScintilla("Consolas", 11)
     End Sub
 
     Private Sub FontChange(sender As Object, e As EventArgs) Handles FontFamilyTSCB.SelectedIndexChanged, FontSizeTSCB.SelectedIndexChanged

DISMTools.sln

@@ -12,6 +12,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISMTools-Setup", "installe
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISMTools-UCS", "Updater\DISMTools-UCS\DISMTools-UCS.vbproj", "{C084B601-F395-47D3-9E66-C0582139DCF4}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnpEax", "Tools\UnpEax\UnpEax.csproj", "{5330BC3F-1BFF-4200-8872-3A2236F814AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,6 +32,10 @@ Global
 		{C084B601-F395-47D3-9E66-C0582139DCF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C084B601-F395-47D3-9E66-C0582139DCF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C084B601-F395-47D3-9E66-C0582139DCF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5330BC3F-1BFF-4200-8872-3A2236F814AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5330BC3F-1BFF-4200-8872-3A2236F814AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5330BC3F-1BFF-4200-8872-3A2236F814AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5330BC3F-1BFF-4200-8872-3A2236F814AB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DISMTools.vbproj

@@ -687,6 +687,12 @@
     <Compile Include="Panels\Report_Dlgs\Get-ImageInfo\ReportForm.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Panels\Startup\AutoReload\AutoReloadForm.Designer.vb">
+      <DependentUpon>AutoReloadForm.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\Startup\AutoReload\AutoReloadForm.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Panels\Startup\SplashScreen.Designer.vb">
       <DependentUpon>SplashScreen.vb</DependentUpon>
     </Compile>
@@ -987,6 +993,9 @@
     <EmbeddedResource Include="Panels\Report_Dlgs\Get-ImageInfo\ReportForm.resx">
       <DependentUpon>ReportForm.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Panels\Startup\AutoReload\AutoReloadForm.resx">
+      <DependentUpon>AutoReloadForm.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Panels\Startup\SplashScreen.resx">
       <DependentUpon>SplashScreen.vb</DependentUpon>
     </EmbeddedResource>
@@ -1581,6 +1590,7 @@
   <ItemGroup>
     <Folder Include="bin\Debug\" />
     <Folder Include="Panels\Set_Ops\" />
+    <Folder Include="Tools\UnpEax\" />
     <Folder Include="Updater\" />
     <Folder Include="wimlib\" />
   </ItemGroup>
@@ -1644,6 +1654,12 @@ IF NOT EXIST scratch (
 )
 :: Copy the Internet Explorer browser emulation registry file to the program directory
 copy /y "$(SolutionDir)Tools\DT_IEConfig.reg" "DT_IEConfig.reg"
+
+IF EXIST "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" (
+	md "Tools\UnpEax"
+	copy /y "$(SolutionDir)Tools\UnpEax\bin\Debug\UnpEax.exe" "Tools\UnpEax\UnpEax.exe"
+)
+
 IF %25ISPREVIEW%25=="Yes" (
 	echo You will be running a preview release, which may not be ready for production. You may experience more bugs and less stability. Please switch to a stable release whenever possible.
 )
@@ -1658,6 +1674,7 @@ IF %25COPY_DOCS%25=="Yes" (
 IF %25GEN_INSTALLER%25=="Yes" (
 	echo The technology used for creating the installer is subject to a license. Refer to the "LICENSE.TXT" file in the "$(SolutionDir)Installer" directory for more information
 	echo Copying program files...
+	IF EXIST "$(SolutionDir)Installer\files" (rd "$(SolutionDir)Installer\files" /s /q)
 	IF NOT EXIST "$(SolutionDir)Installer\files" (md "$(SolutionDir)Installer\files")
 	XCOPY "$(TargetDir)*.*" "$(SolutionDir)Installer\files" /cehyi
 	IF EXIST "$(SolutionDir)Installer\files\VS*.tmp" (del "$(SolutionDir)Installer\files\VS*.tmp" /f /q)
@@ -1694,7 +1711,11 @@ IF EXIST videos (
 )
 
 IF EXIST videos.xml (del videos.xml)
-IF EXIST videos.xml.old (del videos.xml.old)</PreBuildEvent>
+IF EXIST videos.xml.old (del videos.xml.old)
+
+IF EXIST tools (
+	rd tools /s /q
+)</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Helpers/extps1/PE_Helper/PE_Helper.ps1

@@ -472,6 +472,33 @@ function Start-OSApplication
     Write-Host "Selected disk: disk $($drive)"
     $partition = Get-Partitions $drive
     if ($partition -eq 0)
+    {
+        $msg = "This will perform disk configuration changes on disk $drive. THIS WILL DELETE ALL PARTITIONS IN IT. IF YOU ARE NOT WILLING TO LOSE DATA, DO NOT CONTINUE."
+    }
+    else
+    {
+        $msg = "This will perform disk configuration changes on partition $partition. THIS WILL FORMAT IT IT. IF YOU ARE NOT WILLING TO LOSE DATA, DO NOT CONTINUE."
+    }
+    Write-Host $msg -BackgroundColor Black -ForegroundColor Yellow
+    $choice = Read-Host "Are you sure you want to continue (Y/N)"
+    if ($choice -ne "Y")
+    {
+        do
+        {
+            $partition = Get-Partitions $drive
+            if ($partition -eq 0)
+            {
+                $msg = "This will perform disk configuration changes on disk $drive. THIS WILL DELETE ALL PARTITIONS IN IT. IF YOU ARE NOT WILLING TO LOSE DATA, DO NOT CONTINUE.`n"
+            }
+            else
+            {
+                $msg = "This will perform disk configuration changes on partition $partition. THIS WILL FORMAT IT. IF YOU ARE NOT WILLING TO LOSE DATA, DO NOT CONTINUE.`n"
+            }
+            Write-Host $msg -BackgroundColor Black -ForegroundColor Yellow
+            $choice = Read-Host "Are you sure you want to continue (Y/N)"
+        } until ($choice -eq "Y")
+    }
+    if ($partition -eq 0)
     {
         # Proceed with default disk configuration
         Write-DiskConfiguration $drive $true
@@ -481,15 +508,22 @@ function Start-OSApplication
         # Proceed with custom disk configuration
         Write-DiskConfiguration $drive $false
     }
+    wpeutil createpagefile /path="C:\pagefile.sys" /size=256
     $index = Get-WimIndexes
     Write-Host "Applying Windows image. This can take some time..."
-    Start-DismCommand -Verb Apply -ImagePath "C:\" -WimFile "$((Get-Location).Path)sources\install.wim" -WimIndex $index
+    if ((Start-DismCommand -Verb Apply -ImagePath "C:\" -WimFile "$((Get-Location).Path)sources\install.wim" -WimIndex $index) -eq $true)
+    {
+        Write-Host "The Windows image has been applied successfully."
+    }
+    else
+    {
+        Write-Host "Failed to apply the Windows image."
+    }
     Set-Serviceability -ImagePath "C:\"
     New-BootFiles
     # Show message before rebooting system
     Write-Host "The first stage of Setup has completed, and your system will reboot automatically.`n`nIf there are any bootable devices, remove those.`n`nWhen your computer restarts, Setup will continue.`n"
     Show-Timeout -Seconds 15
-    Write-Host "Restarting your system..."
     wpeutil reboot
 }
 
@@ -798,15 +832,16 @@ function New-BootFiles
 }
 
 function Show-Timeout {
-     param (
-         [Parameter(Mandatory = $true, Position = 0)] [int] $seconds
-     )
-     for ($i = 0; $i -lt $seconds; $i++)
-     {
-         Write-Progress -Activity "Restarting system..." -Status "Your system will restart in $($seconds - $i) seconds" -PercentComplete (($i / $seconds) * 100)
-         Start-Sleep -Seconds 1
-     }
- }
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [int] $seconds
+    )
+    for ($i = 0; $i -lt $seconds; $i++)
+    {
+        Write-Progress -Activity "Restarting system..." -Status "Your system will restart in $($seconds - $i) seconds" -PercentComplete (($i / $seconds) * 100)
+        Start-Sleep -Seconds 1
+    }
+    Write-Progress -Activity "Restarting system..." -Status "Restarting your system" -PercentComplete 100
+}
 
 if ($cmd -eq "StartApply")
 {

Helpers/extps1/mImgMgr.ps1

@@ -53,7 +53,6 @@ $global:mImage = Get-WindowsImage -Mounted
 $global:mImages = Get-WindowsImage -Mounted
 $global:selImage = 0
 $global:imgInfo = ''
-$newImg = 0
 $selImgPath = ''
 $ver = '0.5'
 $global:img_removalIndexes = New-Object System.Collections.ArrayList
@@ -70,7 +69,7 @@ $suMountOp = 0
 # Set window title
 $host.UI.RawUI.WindowTitle = "Mounted image manager"
 
-function Mark-Image {
+function Set-Image {
     # Refresh the mounted image variable
     $global:mImage = Get-WindowsImage -Mounted
     if ($global:mImage.Count -ne $global:mImages.Count)
@@ -115,7 +114,7 @@ function Mark-Image {
         else
         {
             Write-Host "You have marked a non-existent mounted image"
-            Mark-Image
+            Set-Image
         }
     }
     if ($option -le $global:mImage.Count)
@@ -131,16 +130,16 @@ function Mark-Image {
     elseif ([System.String]::IsNullOrWhiteSpace($option))
     {
         Write-Host "You have marked a non-existent mounted image"
-        Mark-Image
+        Set-Image
     }
     else
     {
         Write-Host "You have marked a non-existent mounted image"
-        Mark-Image
+        Set-Image
     }
 }
 
-function Unmount-Image {
+function Dismount-Image {
     Clear-Host
     Write-Host "Image about to be unmounted: $($global:mImage[$global:selImage - 1].ImagePath)"`n
     if ($global:mImage[$global:selImage - 1].MountMode -eq 1)
@@ -161,7 +160,7 @@ function Unmount-Image {
                 Write-Host "This image is mounted with read-only permissions. Changes cannot be committed to this image."`n`n"If you want to make changes to this image, you must enable write permissions by pressing the [E] key in the main menu."`n -ForegroundColor Black -BackgroundColor DarkRed
                 Write-Host "Press ENTER to continue..."
                 Read-Host | Out-Null
-                Unmount-Image
+                Dismount-Image
             }
             Write-Host "Unmounting Windows image:"`n"- Image file and index: $($global:mImage[$global:selImage - 1].ImagePath) (index $($global:mImage[$global:selImage - 1].ImageIndex))"`n"- Mount directory: $($global:mImage[$global:selImage - 1].MountPath)"`n"- Operation: Commit"`n"- Additional opperations: don't check integrity, don't append to new index"
             Dismount-WindowsImage -Path $global:mImage[$global:selImage - 1].MountPath -Save
@@ -196,25 +195,25 @@ function Unmount-Image {
             MainMenu
         }
         "S" {
-            Unmount-Settings $false, $false
+            Dismount-Settings $false, $false
         }
         "B" {
             MainMenu
         }
         default {
-            Unmount-Image
+            Dismount-Image
         }
     }
 }
 
-function Unmount-Settings {
+function Dismount-Settings {
     Clear-Host
     if ($global:mImage[$global:selImage - 1].MountMode -eq 1)
     {
         Write-Host "Unmount settings apply to the commit operation. This image was mounted with read-only permissions. Changes cannot be committed to this image."`n`n"If you want to make changes to this image, you must enable write permissions by pressing the [E] key in the main menu."`n -ForegroundColor Black -BackgroundColor DarkRed
         Write-Host "Press ENTER to continue..."
         Read-Host | Out-Null
-        Unmount-Image
+        Dismount-Image
     }
     Write-Host "Unmount settings for image: $($global:mImage[$global:selImage - 1].ImagePath)"`n
     if ($global:checkIntegrity)
@@ -239,11 +238,11 @@ function Unmount-Settings {
     {
         "C" {
             $global:checkIntegrity = -not $global:checkIntegrity
-            Unmount-Settings
+            Dismount-Settings
         }
         "A" {
             $global:appendIndex = -not $global:appendIndex
-            Unmount-Settings
+            Dismount-Settings
         }
         "P" {
             Write-Host `n"Unmounting image with specified settings..."`n
@@ -279,7 +278,7 @@ function Unmount-Settings {
             MainMenu
         }
         default {
-            Unmount-Settings
+            Dismount-Settings
         }
     }
 }
@@ -673,7 +672,7 @@ function Get-MenuItems {
     Write-Host "[X]: Exit"
 }
 
-function Detect-MountedImageIndexChanges {
+function Get-MountedImageIndexChanges {
     if ($global:selImage -eq 0) { return }
     $global:mImage = Get-WindowsImage -Mounted
     $global:mImages = Get-WindowsImage -Mounted
@@ -711,7 +710,7 @@ function MainMenu {
     # List mounted Windows images
     Get-WindowsImage -Mounted | Format-Table
     Write-Host `n`n`n
-    Detect-MountedImageIndexChanges
+    Get-MountedImageIndexChanges
     if (($global:selImage -eq 0) -and $global:mImage.Count -ge 1)
     {
         Write-Host "No image has been marked for management. Press the [M] key to mark a mounted image..."
@@ -732,11 +731,11 @@ function MainMenu {
     $option = Read-Host -Prompt "Select an option and press ENTER"
     switch ($option)
     {
-        "M" { Mark-Image }
+        "M" { Set-Image }
         "U" {
             if ($global:mImage[$global:selImage - 1].MountMode -eq 0)
             {             
-                Unmount-Image
+                Dismount-Image
             }
             elseif ($global:mImage[$global:selImage - 1].MountMode -eq 1)
             {

Installer/dt.iss

@@ -78,6 +78,7 @@ Source: ".\files\WeifenLuo.WinFormsUI.Docking.dll"; DestDir: "{#pfDir}"; Flags:
 Source: ".\files\WeifenLuo.WinFormsUI.Docking.ThemeVS2012.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\bin\*"; DestDir: "{#pfDir}\bin"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ".\files\docs\*"; DestDir: "{#pfDir}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ".\files\tools\*"; DestDir: "{#pfDir}\tools"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: ".\files\videos\*"; DestDir: "{#pfDir}\videos"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
@@ -122,9 +123,9 @@ Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dwo
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "ColorSchemes"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "ExpandedProgressPanel"; ValueData: 1; Flags: uninsdeletevalue createvalueifdoesntexist
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "Language"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
-Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: string; ValueName: "LogFont"; ValueData: "Courier New"; Flags: uninsdeletevalue createvalueifdoesntexist
+Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: string; ValueName: "LogFont"; ValueData: "Consolas"; Flags: uninsdeletevalue createvalueifdoesntexist
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "LogFontBold"; ValueData: 0; Flags: uninsdeletevalue createvalueifdoesntexist
-Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "LogFontSi"; ValueData: 10; Flags: uninsdeletevalue createvalueifdoesntexist
+Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "LogFontSi"; ValueData: 11; Flags: uninsdeletevalue createvalueifdoesntexist
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "NewDesign"; ValueData: 1; Flags: uninsdeletevalue createvalueifdoesntexist
 Root: HKCU; Subkey: "Software\DISMTools\Preview\Personalization"; ValueType: dword; ValueName: "SecondaryProgressPanelStyle"; ValueData: 1; Flags: uninsdeletevalue createvalueifdoesntexist