DISMTools 0.5 Preview 8 (Beta 4)

Helpers/extps1/PE_Helper/PE_Helper.ps1

@@ -612,7 +612,7 @@ function Start-OSApplication
             } until ($driveLetter -ne "")
         }
     }
-    wpeutil createpagefile /path="$($driveLetter):\pagefile.sys" /size=256
+    wpeutil createpagefile /path="$($driveLetter):\WinPEpge.sys" /size=256
     $wimFile = Get-WimIndexes
     $serviceableArchitecture = (((Get-CimInstance -Class Win32_Processor | Where-Object { $_.DeviceID -eq "CPU0" }).Architecture) -eq (Get-WindowsImage -ImagePath "$($wimFile.wimPath)" -Index $wimFile.index).Architecture)
     Write-Host "Applying Windows image. This can take some time..."
@@ -1038,8 +1038,28 @@ function Set-Serviceability
         [Parameter(Mandatory = $true, Position = 0)] [string] $ImagePath
     )
     Write-Host "Starting serviceability tests..."
-    # Bit of a mouthful, but good for PowerShell verbs
-    dism /image=$ImagePath /is-serviceable
+    # Follow Panther engine steps (https://github.com/CodingWonders/Panther-Diagram)
+    Write-Host "Creating temporary directory for serviceability operations..."
+    $scratchDir = ""
+    $driveLetter = ""
+    try
+    {
+        $folderPath = $ImagePath.Replace("\", "").Trim()
+        $driveLetter = $folderPath
+        if (-not (Test-Path "$folderPath\`$DISMTOOLS.~LS")) { New-Item -Path "$folderPath\`$DISMTOOLS.~LS" -ItemType Directory | Out-Null }
+        $guidStr = [System.Guid]::NewGuid().Guid
+        New-Item -Path "$folderPath\`$DISMTOOLS.~LS\PackageTemp\$guidStr" -ItemType Directory | Out-Null
+        Write-Host "Successfully created the scratch directory."
+        $scratchDir = "$folderPath\`$DISMTOOLS.~LS\PackageTemp\$guidStr"
+        # Bit of a mouthful, but good for PowerShell verbs (+ scratch dir support)
+        dism /image=$ImagePath /scratchdir="$scratchDir" /is-serviceable
+    }
+    catch
+    {
+        Write-Host "Could not create temporary directory. Continuing without one. Do note that the serviceability tests might fail."
+        # Bit of a mouthful, but good for PowerShell verbs
+        dism /image=$ImagePath /is-serviceable
+    }
     if ($?)
     {
         Write-Host "Serviceability tests have succeeded. The image is valid."
@@ -1048,6 +1068,12 @@ function Set-Serviceability
     {
         Write-Host "Serviceability tests have failed. The image is not valid."        
     }
+    if (($scratchDir -ne "") -and (Test-Path -Path "$scratchDir"))
+    {
+        Write-Host "Removing temporary directory..."
+        Remove-Item -Path "$scratchDir" -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
+        Remove-Item -Path "$driveLetter\`$DISMTOOLS.~LS" -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
+    }
 }
 
 function New-BootFiles
@@ -1081,7 +1107,7 @@ function New-BootFiles
             {
                 foreach ($disk in $(Get-CimInstance -ClassName Win32_DiskPartition))
                 {
-                    if ($disk.BootPartition)
+                    if (($disk.DiskIndex -eq $diskId) -and ($disk.BootPartition))
                     {
                         $MSRAssign = @'
                         sel dis #DISKID#
@@ -1112,7 +1138,7 @@ function New-BootFiles
             {
                 foreach ($disk in $(Get-CimInstance -ClassName Win32_DiskPartition))
                 {
-                    if ($disk.BootPartition)
+                    if (($disk.DiskIndex -eq $diskId) -and ($disk.BootPartition))
                     {
                         $MSRAssign = @'
                         sel dis #DISKID#

Helpers/extps1/mImgMgr.ps1

@@ -63,7 +63,7 @@ function Get-MenuItems
     #>
     param (
         [Parameter(Mandatory = $true, Position = 0)] [int] $selImage,
-        [Parameter(Mandatory = $true, Position = 1)] [Object[]] $mountedImages
+        [Parameter(Position = 1)] [Object[]] $mountedImages
     )
     try
     {

MainForm.vb

@@ -3633,6 +3633,20 @@ Public Class MainForm
         Return False
     End Function
 
+    Public Event APIExceptionThrown(errorEx As Exception)
+
+    Private Sub APIExceptionHandler(errorEx As Exception) Handles Me.APIExceptionThrown
+        MsgBox(errorEx.Message, vbOKOnly + vbExclamation, "API error")
+    End Sub
+
+    Sub ThrowAPIException(APIException As DismException)
+        Dim errorEx As New Exception("An error occurred while getting information with the DISM API. Consider reading the message below for more information:" & CrLf & CrLf &
+                                     APIException.Message & CrLf & CrLf &
+                                     "This does not indicate a program error, but it implies that you will not be able to perform some operations unless the issue is resolved." & CrLf & CrLf &
+                                     "Error code: " & Hex(APIException.HResult), APIException)
+        RaiseEvent APIExceptionThrown(errorEx)
+    End Sub
+
     ''' <summary>
     ''' Gets installed packages in an image and puts them in separate arrays
     ''' </summary>
@@ -3664,6 +3678,8 @@ Public Class MainForm
                     imgPackageRelType = imgPackageRelTypeList.ToArray()
                     imgPackageInstTime = imgPackageInstTimeList.ToArray()
                 End Using
+            Catch ex As DismException
+                ThrowAPIException(ex)
             Finally
                 DismApi.Shutdown()
             End Try
@@ -3827,6 +3843,8 @@ Public Class MainForm
                     imgFeatureNames = imgFeatureNameList.ToArray()
                     imgFeatureState = imgFeatureStateList.ToArray()
                 End Using
+            Catch ex As DismException
+                ThrowAPIException(ex)
             Finally
                 DismApi.Shutdown()
             End Try
@@ -4011,6 +4029,8 @@ Public Class MainForm
                     imgAppxResourceIds = imgAppxResourceIdList.ToArray()
                     imgAppxVersions = imgAppxVersionList.ToArray()
                 End Using
+            Catch ex As DismException
+                ThrowAPIException(ex)
             Finally
                 DismApi.Shutdown()
             End Try
@@ -4246,6 +4266,8 @@ Public Class MainForm
                     imgCapabilityIds = imgCapabilityNameList.ToArray()
                     imgCapabilityState = imgCapabilityStateList.ToArray()
                 End Using
+            Catch ex As DismException
+                ThrowAPIException(ex)
             Finally
                 DismApi.Shutdown()
             End Try
@@ -4413,6 +4435,8 @@ Public Class MainForm
                     imgDrvVersions = imgDrvVersionList.ToArray()
                     imgDrvBootCriticalStatus = imgDrvBootCriticalStatusList.ToArray()
                 End Using
+            Catch ex As DismException
+                ThrowAPIException(ex)
             Finally
                 DismApi.Shutdown()
             End Try

My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' mediante el asterisco ('*'), como se muestra a continuación:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.5.0.2452")> 
-<Assembly: AssemblyFileVersion("0.5.0.2452")> 
+<Assembly: AssemblyVersion("0.5.0.2461")> 
+<Assembly: AssemblyFileVersion("0.5.0.2461")> 

My Project/Resources.resx

@@ -1119,15 +1119,21 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   <data name="WhatsNew" xml:space="preserve">
     <value>Bugfixes:
 
-- Fixed some splash screen issues if the program is run on Windows 7/Server 2008 R2 or if the program is run without administrative privileges (thanks liliactr on the My Digital Life forums for spotting)
+- Fixed an issue in the CLI version of the mounted image manager that would throw an error at startup if no images were mounted
+- If the download or install sizes of capabilities are less than 1024 bytes, the program will no longer show "(~)"
+- Fixed a critical issue where all DISM commands would fail for offline installations if the mount directory were a drive (thanks @Xhib-ba for spotting)
 
 New features:
 
-- Existing PowerShell tooling (excluding the PE Helper) has been refactored and cleaned up for increased code readability and quality
-- If you were to add multiple installation images to your customized ISO files, the PE helper will now ask you what image to apply
-- You can now get who signed a driver when saving installed driver information to a file
-- The way custom properties of packages and features are viewed has been improved, better showing the hierarchy of these properties
-- The Scintilla.NET library has been updated to version 5.5.1</value>
+- The program update system has had some improvements:
+  - A minimum version threshold has been added to update information files. The currently running version is compared with this threshold to determine if settings should be migrated
+- The 7-Zip component has been updated to version 24.06
+- The Preinstallation Environment (PE) helper has had some improvements:
+  - The OS installer now creates a scratch directory on the target drive to avoid any DISM serviceability warnings
+  - Disk volume checks have been improved to ensure that the correct boot volume is selected when creating boot files
+- The App Installer downloader now informs of download errors and saves target files using the extension in the URL
+- The custom property viewer can now prompt you to select a property if you haven't done so
+- The program can now detect and inform about DISM API errors to you</value>
   </data>
   <data name="split_img" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\split_img.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>