DISMTools 0.7.2 Preview 4 (#312)

* Update assembly information

* [PE Helper/PXE Helpers/FOGHS] Add UNIX usage notes

* [PE Helper/PXE Helpers] Add menu items for Server components

* [PE Helper/PXE Helpers/FOGHS] Detect fog and mariadb systemd service units

* [ISO Creator] Detect Windows UEFI CA 2023 DBX cert on current system

* [ISO Creator] Skip checks on BIOS systems

* [ISO Creator] Do not show DBX warning on UEFI systems without Secure Boot

* [Unattended answer file] For starter scripts in browser, correctly detect language

* [PMIP] Show in the center by default

* [PE Helper] Update HotInstall and Sysprep Preparator binaries

* [PE Helper] Add option to launch DIM on image capture script

* [Lib] Update Scintilla.NET to 6.1.1

* [Unattended answer file] Add auto-edition button for product keys

* [PE Helper/PXE Helpers/WDSHC] Warn when loaded on non-PXE environment

* [Fix] Automatically close web-enabled forms on closure

* [Fix] Do not download updater if it can't be deleted

* [PE Helper/PXE Helpers/WDSHC] Automatically get WDS server IP address

* [PE Helper/PXE Helpers/WDSHC] Validate more server auth input

* [PE Helper] Add support for WDS tools

* [PE Helper] Allow image capture script to load WDS image capture wizard

* [PE Helper] Remove DT PE BCD entry after WDS capture completes

* [PE Helper] Create custom wdscapture config list file to exclude DT folders

* [Unattended answer file] Update UnattendGen

* [Unattended answer file] Show message when no matches are found

* [PE Helper] Do not show WDS option if WDSCAPTURE does not exist

* [Fix] Add AdkInstallation value regardless of what function returns

* [Unattended answer file] Default to new message on script creation

* [Fix] Close another form before closing application

* [Refactor] Refactor ADK detection

This change makes ADK detection more reliable across the program and in the PE Helper. Thanks rayman95 on the MDL forums

* [PE Helper] Fix issues with ADK detection if kits root is only on WOW6432Node

* [REL] Update What's New section

Author: CodingWonders

DISMTools.vbproj

@@ -107,8 +107,8 @@
     <Reference Include="PresentationFramework">
       <Private>True</Private>
     </Reference>
-    <Reference Include="Scintilla.NET, Version=6.1.0.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
-      <HintPath>packages\Scintilla5.NET.6.1.0\lib\net462\Scintilla.NET.dll</HintPath>
+    <Reference Include="Scintilla.NET, Version=6.1.1.0, Culture=neutral, PublicKeyToken=0221e70ba618311e, processorArchitecture=MSIL">
+      <HintPath>packages\Scintilla5.NET.6.1.1\lib\net462\Scintilla.NET.dll</HintPath>
     </Reference>
     <Reference Include="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <Private>True</Private>
@@ -1544,6 +1544,9 @@
     <Content Include="Helpers\extps1\PE_Helper\files\README1ST.TXT">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Helpers\extps1\PE_Helper\pxehelpers\fog\foghs_unix_notes.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Helpers\extps1\PE_Helper\tools\DIM\aarch64\DT-DIM.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -2139,11 +2142,11 @@ IF EXIST "report.html" (del "report.html")</PreBuildEvent>
   <Target Name="AfterBuild">
   </Target>
   -->
-  <Import Project="packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets')" />
+  <Import Project="packages\Scintilla5.NET.6.1.1\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.6.1.1\build\scintilla5.net.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.6.1.0\build\scintilla5.net.targets'))" />
+    <Error Condition="!Exists('packages\Scintilla5.NET.6.1.1\build\scintilla5.net.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Scintilla5.NET.6.1.1\build\scintilla5.net.targets'))" />
   </Target>
 </Project>

Helpers/extps1/PE_Helper/PE_Helper.ps1

@@ -77,6 +77,50 @@ if (([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]:
     exit 1
 }
 
+function Get-KitsRoot {
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [bool]$wow64environment
+    )
+
+    $adk10KitsRoot = ""
+
+    # if we set the wow64 bit on and we're on a 32-bit system, then we prematurely return the value
+    if (($wow64environment -eq $true) -and (-not [Environment]::Is64BitOperatingSystem)) {
+        return $adk10KitsRoot
+    }
+
+    $regPath = ""
+    if ($wow64environment) {
+        $regPath = "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows Kits\Installed Roots"
+    } else {
+        $regPath = "HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots"
+    }
+
+    if ((Test-Path "$regPath") -eq $false) {
+        return $adk10KitsRoot
+    }
+
+    try {
+        $adk10KitsRoot = Get-ItemPropertyValue -Path $regPath -Name "KitsRoot10" -ErrorAction Stop
+    } catch {
+        Write-Host "Could not find ADK."
+    }
+
+    return $adk10KitsRoot
+}
+
+function Test-KitsRootPaths {
+    param (
+        [Parameter(Mandatory = $true, Position = 0)] [string]$adkKitsRootPath,
+        [Parameter(Mandatory = $true, Position = 1)] [string]$adkKitsRootPath_WOW64Environ
+    )
+
+    if (Test-Path "$adkKitsRootPath") { return $true }
+    if (Test-Path "$adkKitsRootPath_WOW64Environ") { return $true }
+
+    return $false
+}
+
 function Start-PEGeneration
 {
     <#
@@ -94,24 +138,26 @@ function Start-PEGeneration
     # Detect if the Windows ADK is present
     try
     {
-        if ((Get-ItemPropertyValue -Path 'HKLM:\SOFTWARE\Microsoft\WIMMount' -Name 'AdkInstallation') -eq 1)
+        # RAYMAN prompted the change. YEAH!
+        $adkKitsRoot = Get-KitsRoot -wow64environment $false
+        $adkKitsRoot_WOW64Environ = Get-KitsRoot -wow64environment $true
+
+        $expectedADKPath = "$($adkKitsRoot)Assessment and Deployment Kit"
+        $expectedADKPath_WOW64Environ = "$($adkKitsRoot_WOW64Environ)Assessment and Deployment Kit"
+
+        if ((Test-KitsRootPaths -adkKitsRootPath "$expectedADKPath" -adkKitsRootPath_WOW64Environ "$expectedADKPath_WOW64Environ") -eq $true)
         {
-            # An ADK may be installed, but it may not be Windows 10 ADK
-            $progFiles = ""
             $peToolsPath = ""
-            if ([Environment]::Is64BitOperatingSystem)
-            {
-                $progFiles = "$env:SYSTEMDRIVE\Program Files (x86)"
-            }
-            else
-            {
-                $progFiles = "$env:SYSTEMDRIVE\Program Files"
-            }
-            if (Test-Path "$progFiles\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment")
+
+            if ($expectedADKPath -ne "Assessment and Deployment Kit") { $peToolsPath = $expectedADKPath }
+            if (($peToolsPath -eq "") -and ($expectedADKPath_WOW64Environ -ne "")) { $peToolsPath = $expectedADKPath_WOW64Environ }
+
+            if (Test-Path "$peToolsPath")
             {
-                $peToolsPath = "$progFiles\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment"
+                Write-Host "Using $peToolsPath as the Preinstallation Environment tools path..."
+
                 Write-Host "Creating working directory and copying Preinstallation Environment (PE) files..."
-                if ((Copy-PEFiles -peToolsPath "$progFiles\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment" -architecture $architecture -targetDir "$((Get-Location).Path)\ISOTEMP") -eq $false)
+                if ((Copy-PEFiles -peToolsPath "$peToolsPath\Windows Preinstallation Environment" -architecture $architecture -targetDir "$((Get-Location).Path)\ISOTEMP") -eq $false)
                 {
                     Write-Host "Preinstallation Environment creation has failed in the PE file copy phase."
                     Write-Host "`nPress ENTER to exit"
@@ -176,7 +222,7 @@ function Start-PEGeneration
                     Start-DismCommand -Verb Commit -ImagePath "$mountDirectory" | Out-Null
                 }
                 Write-Host "Copying Windows PE optional components. Please wait..."
-                if ((Copy-PEComponents -peToolsPath "$progFiles\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment" -architecture $architecture -targetDir "$((Get-Location).Path)\ISOTEMP") -eq $false)
+                if ((Copy-PEComponents -peToolsPath "$peToolsPath\Windows Preinstallation Environment" -architecture $architecture -targetDir "$((Get-Location).Path)\ISOTEMP") -eq $false)
                 {
                     Write-Host "Preinstallation Environment creation has failed in the PE optional component copy phase."
                     Write-Host "`nPress ENTER to exit"
@@ -501,6 +547,8 @@ function Add-PEPackages {
         $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\en-US\WinPE-EnhancedStorage_en-us.cab")
         $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\WinPE-StorageWMI.cab")
         $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\en-US\WinPE-StorageWMI_en-us.cab")
+        $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\WinPE-WDS-Tools.cab")
+        $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\en-US\WinPE-WDS-Tools_en-us.cab")
         # Add ARM64EC packages
         if ($architecture -eq 'arm64') {
             $pkgs.Add("$((Get-Location).Path)\ISOTEMP\OCs\WinPE-x64-Support.cab")
@@ -835,11 +883,11 @@ function New-WinPEIso
         }
         if ([Environment]::Is64BitOperatingSystem)
         {
-            Set-Item -Path "env:NewPath" -Value "$peToolsPath\..\Deployment Tools\amd64\Oscdimg"
+            Set-Item -Path "env:NewPath" -Value "$peToolsPath\Deployment Tools\amd64\Oscdimg"
         }
         else
         {
-            Set-Item -Path "env:NewPath" -Value "$peToolsPath\..\Deployment Tools\x86\Oscdimg"
+            Set-Item -Path "env:NewPath" -Value "$peToolsPath\Deployment Tools\x86\Oscdimg"
         }
         # Detect whether files are in fwfiles or bootbins - ADK 10.1.26100.2454 and later put boot files in bootbins,
         # not in fwfiles. All of this to add support for the boot binaries signed with this certificate - I'm starting to

Helpers/extps1/PE_Helper/files/HotInstall.zip

@@ -1,4 +1,7 @@
 @echo off
+set sysdrive=%SYSTEMDRIVE%
+
+:main
 cls
 echo Image Capture Utility
 echo =========================
@@ -11,17 +14,40 @@ echo.
 echo Showing drive letter assignments...
 set scriptpath=%TEMP%\%RANDOM%.txt
 set configlistpath=%TEMP%\configlist.ini
+set wdscapturepath=%SYSTEMROOT%\system32\wdscapture.inf
 
 echo lis vol > %scriptpath%
 echo exi >> %scriptpath%
 
 diskpart /s %scriptpath%
 
-set /p sourcedrive=Please enter the letter of the volume to capture: 
+echo.
+echo - To install drivers if you don't see your drives, type "DIM"
+if exist "%SYSTEMROOT%\system32\wdscapture.exe" ( echo - To prepare a capture for a Windows Deployment Services server, type "WDS" )
+echo.
+
+set /p sourcedrive=Please enter the letter of the volume to capture, or option to invoke: 
 if not defined sourcedrive (
 	echo The letter of the volume to capture must be specified.
 	exit /b 1
 )
+
+if "%sourcedrive%" equ "DIM" (
+	call :dt_dim_driver_install
+	goto :main
+)
+
+if "%sourcedrive%" equ "WDS" (
+	if not exist "%SYSTEMROOT%\system32\wdscapture.exe" ( goto :main )
+	call :create_wdscapture_config_list
+	"%SYSTEMROOT%\system32\wdscapture.exe"
+	if %ERRORLEVEL% equ 0 (
+		echo WDS capture succeeded.
+		call :sysprep_hotinstall_remove_temp_files
+	)
+	exit /b
+)
+
 set /p destdrive=Please enter the letter of the volume the file will be stored on: 
 if not defined destdrive (
 	echo The letter of the volume where the image will be stored must be specified.
@@ -73,6 +99,17 @@ echo The capture script was invoked by the Sysprep preparation tool. Removing fi
 bcdedit /delete {current} /f
 exit /b
 
+:dt_dim_driver_install
+echo Starting the Driver Installation Module for architecture %PROCESSOR_ARCHITECTURE%...
+if "%PROCESSOR_ARCHITECTURE%" equ "X86" (
+	"%sysdrive%\Tools\DIM\i386\DT-DIM.exe"
+) else if "%PROCESSOR_ARCHITECTURE%" equ "AMD64" (
+	"%sysdrive%\Tools\DIM\amd64\DT-DIM.exe"
+) else if "%PROCESSOR_ARCHITECTURE%" equ "ARM64" (
+	"%sysdrive%\Tools\DIM\aarch64\DT-DIM.exe"
+)
+exit /b
+
 :create_config_list
 echo Setting up file/folder exclusions for source volume...
 REM create the config list file. It will call echo lots of times
@@ -98,4 +135,38 @@ echo [CompressionExclusionList] >> %configlistpath%
 echo *.mp3 >> %configlistpath%
 echo *.zip >> %configlistpath%
 echo *.cab >> %configlistpath%
-echo \WINDOWS\inf\*.pnf >> %configlistpath%
+echo \WINDOWS\inf\*.pnf >> %configlistpath%
+exit /b
+
+:create_wdscapture_config_list
+echo Preparing wdscapture.inf...
+REM we can perform modifications to wdscapture.inf without touching the ACLs.
+echo [Capture] > %wdscapturepath%
+echo Unattended=No >> %wdscapturepath%
+echo VolumeToCapture= >> %wdscapturepath%
+echo SystemRoot= >> %wdscapturepath%
+echo ImageName= >> %wdscapturepath%
+echo ImageDescription= >> %wdscapturepath%
+echo DestinationFile= >> %wdscapturepath%
+echo Overwrite=No >> %wdscapturepath%
+echo. >> %wdscapturepath%
+echo [ExclusionList] >> %wdscapturepath%
+echo $ntfs.log >> %wdscapturepath%
+echo hiberfil.sys >> %wdscapturepath%
+echo pagefile.sys >> %wdscapturepath%
+echo "System Volume Information" >> %wdscapturepath%
+echo RECYCLER >> %wdscapturepath%
+echo winpepge.sys >> %wdscapturepath%
+echo %%SYSTEMROOT%%\CSC >> %wdscapturepath%
+echo $DISMTOOLS.~BT >> %wdscapturepath%
+echo $DISMTOOLS.~WS >> %wdscapturepath%
+echo. >> %wdscapturepath%
+echo [WDS] >> %wdscapturepath%
+echo UploadToWDSServer=No >> %wdscapturepath%
+echo WDSServerName= >> %wdscapturepath%
+echo WDSImageGroup= >> %wdscapturepath%
+echo Username= >> %wdscapturepath%
+echo Password= >> %wdscapturepath%
+echo DeleteLocalWimOnSuccess=No >> %wdscapturepath%
+echo. >> %wdscapturepath%
+exit /b

Helpers/extps1/PE_Helper/files/SysprepPreparator.zip

@@ -11,16 +11,43 @@ if [[ ! $? ]]; then
     echo "PowerShell is not installed. Refer to Microsoft documentation in order to install PowerShell for UNIX."
     echo "If you see this message even when PowerShell is installed on your system, please report this issue."
     echo ""
-    echo "Exiting..."
+    echo "Showing usage instructions and exiting..."
+    if [[ -f "./pxehelpers/fog/foghs_unix_notes.txt" ]]; then
+        more ./pxehelpers/fog/foghs_unix_notes.txt
+    fi
     exit 1
 fi
 
 if [[ ! -f "$FOGHELPER_SCRIPTPATH" ]]; then
     echo "The FOG Helper server component for Unix systems is not available in either the current path or the provided disc."
-    echo "Exiting..."
+    echo "Showing usage instructions and exiting..."
+    if [[ -f "./pxehelpers/fog/foghs_unix_notes.txt" ]]; then
+        more ./pxehelpers/fog/foghs_unix_notes.txt
+    fi
     exit 2
 fi
 
+# get amount of systemd units for both fog and mariadb
+FOG_SYSTEMD_UNITS=$(ls -lA /usr/lib/systemd/system/FOG*.service 2>/dev/null | wc -l)
+
+if [[ $FOG_SYSTEMD_UNITS -le 0 ]]; then
+    echo "No FOG services have been detected on this system."
+    echo "Showing usage instructions and exiting..."
+    if [[ -f "./pxehelpers/fog/foghs_unix_notes.txt" ]]; then
+        more ./pxehelpers/fog/foghs_unix_notes.txt
+    fi
+    exit 3
+fi
+
+if [[ ! -f "/usr/lib/systemd/system/mariadb.service" ]]; then
+    echo "MariaDB service has not been detected on this system."
+    echo "Showing usage instructions and exiting..."
+    if [[ -f "./pxehelpers/fog/foghs_unix_notes.txt" ]]; then
+        more ./pxehelpers/fog/foghs_unix_notes.txt
+    fi
+    exit 3
+fi
+
 echo "You may be asked for your password as starting up the FOG Helper Server requires setting up firewall rules for"
 echo "the API listeners and the web server."
 

Helpers/extps1/PE_Helper/files/scripts/imagecapture.bat

@@ -140,6 +140,17 @@ if ($env:NOFWRULESETUP -ne $null) {
     $noFirewallSetup = $true
 }
 
+# Detect FOG and MariaDB systemd units
+if ((Get-ChildItem -Path "/usr/lib/systemd/system/FOG*.service" -ErrorAction SilentlyContinue).Count -le 0) {
+    Write-LogMessage -message "FOG systemd service units not detected. FOG service is not installed!"
+    return $false
+}
+
+if ((Test-Path -Path "/usr/lib/systemd/system/mariadb.service" -PathType Leaf) -eq $false) {
+    Write-LogMessage -message "MariaDB systemd service unit not detected. Database service is not installed!"
+    return $false
+}
+
 if ((Invoke-FogModuleAvailabilityPreparation) -eq $false) {
     Write-LogMessage -message "Could not prepare FOG API module. Exiting..."
     return $false