DISMTools 0.5

ApplicationEvents.vb

@@ -23,7 +23,7 @@ Namespace My
         Private Sub CatchEmAll(sender As Object, e As Microsoft.VisualBasic.ApplicationServices.UnhandledExceptionEventArgs) Handles Me.UnhandledException
             ExceptionForm.ErrorText.Text = e.Exception.ToString() & CrLf & CrLf &
                                            "Error Message: " & e.Exception.Message & CrLf & CrLf &
-                                           "Error Code (HRESULT): " & e.Exception.HResult
+                                           "Error Code (HRESULT): " & Hex(e.Exception.HResult)
             Try
                 ' Get basic information about the system. This does not include any personally identifiable information (PII) or
                 ' serial numbers that can identify the computer this program is run on

DISMTools.sln

@@ -10,6 +10,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 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
@@ -24,6 +26,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

@@ -143,6 +143,9 @@
     <Compile Include="ApplicationEvents.vb" />
     <Compile Include="Elements\AppxPackage.vb" />
     <Compile Include="Elements\Recents.vb" />
+    <Compile Include="Elements\SearchBox.vb">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Help\HelpBrowserForm.Designer.vb">
       <DependentUpon>HelpBrowserForm.vb</DependentUpon>
     </Compile>
@@ -459,6 +462,12 @@
     <Compile Include="Panels\Img_Ops\ImgCapture.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Panels\Img_Ops\ImgExport.Designer.vb">
+      <DependentUpon>ImgExport.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\Img_Ops\ImgExport.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Panels\Img_Ops\ImgIndexDelete.Designer.vb">
       <DependentUpon>ImgIndexDelete.vb</DependentUpon>
     </Compile>
@@ -561,6 +570,12 @@
     <Compile Include="Panels\Internal\ProjectValueLoadForm.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="Panels\ISOFiles\ISOCreator.Designer.vb">
+      <DependentUpon>ISOCreator.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\ISOFiles\ISOCreator.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Panels\MSEdge\AddEdgeBrowser.Designer.vb">
       <DependentUpon>AddEdgeBrowser.vb</DependentUpon>
     </Compile>
@@ -868,6 +883,9 @@
     <EmbeddedResource Include="Panels\Img_Ops\ImgCapture.resx">
       <DependentUpon>ImgCapture.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Panels\Img_Ops\ImgExport.resx">
+      <DependentUpon>ImgExport.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Panels\Img_Ops\ImgIndexDelete.resx">
       <DependentUpon>ImgIndexDelete.vb</DependentUpon>
     </EmbeddedResource>
@@ -919,6 +937,9 @@
     <EmbeddedResource Include="Panels\Internal\ProjectValueLoadForm.resx">
       <DependentUpon>ProjectValueLoadForm.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Panels\ISOFiles\ISOCreator.resx">
+      <DependentUpon>ISOCreator.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Panels\MSEdge\AddEdgeBrowser.resx">
       <DependentUpon>AddEdgeBrowser.vb</DependentUpon>
     </EmbeddedResource>
@@ -1026,6 +1047,15 @@
     <None Include="Helpers\extps1\mImgMgr.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="Helpers\extps1\PE_Helper\files\diskpart\dp_listdisk.dp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Helpers\extps1\PE_Helper\files\startup\startnet.cmd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Helpers\extps1\PE_Helper\PE_Helper.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="Installer\Default.isl" />
     <None Include="Installer\French.isl" />
     <None Include="Installer\German.isl" />
@@ -1207,6 +1237,18 @@
     <Content Include="docs\search\main.js" />
     <Content Include="docs\search\worker.js" />
     <Content Include="docs\sitemap.xml" />
+    <Content Include="Helpers\extps1\PE_Helper\backgrounds\winpe_amd64.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Helpers\extps1\PE_Helper\backgrounds\winpe_arm.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Helpers\extps1\PE_Helper\backgrounds\winpe_arm64.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Helpers\extps1\PE_Helper\backgrounds\winpe_x86.jpg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Include="Installer\dt.iss" />
     <Content Include="Installer\ISCC.exe" />
     <Content Include="Installer\ISCmplr.dll" />
@@ -1266,8 +1308,19 @@
     <None Include="Resources\about\gitter_chat.png" />
     <None Include="Resources\import_driver.png" />
     <None Include="Resources\onedrive_exclusion.png" />
+    <None Include="Resources\color_schemes\CS_Idle_Blue.png" />
+    <None Include="Resources\color_schemes\CS_Idle_Green.png" />
+    <None Include="Resources\color_schemes\CS_Ops_Blue.png" />
+    <None Include="Resources\color_schemes\CS_Ops_Green.png" />
+    <None Include="Resources\color_schemes\CS_ProgressPanel_Blue.png" />
+    <None Include="Resources\color_schemes\CS_ProgressPanel_Green.png" />
     <None Include="Resources\error_32px.png" />
+    <None Include="Resources\search_dark.png" />
+    <None Include="Resources\search_light.png" />
     <None Include="Resources\video_play.png" />
+    <None Include="Resources\progresspanel_logview_hidden.png" />
+    <None Include="Resources\progresspanel_logview_shown.png" />
+    <None Include="Resources\create_iso.png" />
     <Content Include="ThemeVS2012\Resources\Dockindicator_PaneDiamond_Hotspot.png" />
     <Content Include="ThemeVS2012\Resources\DockIndicator_PaneDiamond_HotspotIndex.png" />
     <Content Include="ThemeVS2012\Resources\MaskArrowBottom.png" />
@@ -1541,6 +1594,7 @@
   <ItemGroup>
     <Folder Include="bin\Debug\" />
     <Folder Include="Panels\Set_Ops\" />
+    <Folder Include="Tools\UnpEax\" />
     <Folder Include="Updater\" />
     <Folder Include="wimlib\" />
   </ItemGroup>
@@ -1559,7 +1613,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>SET DELETELOGDIR="Yes"
-SET ISPREVIEW="No"
+SET ISPREVIEW="Yes"
 SET GEN_INSTALLER="Yes"
 SET COPY_DOCS="Yes"
 ECHO Generating program structure...
@@ -1568,14 +1622,16 @@ IF EXIST "$(SolutionDir)portable" (
 	ATTRIB portable +H
 )
 IF NOT EXIST bin (
-	md bin
-	md bin\exthelpers
-	md bin\extbatch
-	md bin\utils
-	md bin\extps1
-	move helpers\extbatch\*.* bin\extbatch
-	move helpers\dthelper.bat bin
-	move helpers\extps1\*.* bin\extps1
+	md "bin"
+	md "bin\exthelpers"
+	md "bin\extbatch"
+	md "bin\utils"
+	md "bin\extps1"
+	move "helpers\extbatch\*.*" "bin\extbatch"
+	move "helpers\dthelper.bat" "bin"
+	move "helpers\extps1\*.*" "bin\extps1"
+	md "bin\extps1\PE_Helper"
+	xcopy "helpers\extps1\PE_Helper\*.*" "bin\extps1\PE_Helper" /cehyi
 	IF EXIST HELPERS (
 		rd HELPERS /s /q
 	)
@@ -1602,6 +1658,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.
 )
@@ -1653,7 +1715,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>
   <Import Project="packages\Scintilla5.NET.5.5.1\build\scintilla5.net.targets" Condition="Exists('packages\Scintilla5.NET.5.5.1\build\scintilla5.net.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

Elements/SearchBox.vb

@@ -0,0 +1,33 @@
+Imports System
+Imports System.Windows.Forms
+Imports System.Runtime.InteropServices
+
+Public Class SearchBox
+    Inherits TextBox
+
+    Private Const EM_SETCUEBANNER As Integer = &H1501
+    <DllImport("user32.dll", CharSet:=CharSet.Auto)>
+    Private Shared Function SendMessage(ByVal hWnd As IntPtr, ByVal msg As Integer, ByVal wParam As Integer, ByVal lParam As String) As Int32
+    End Function
+
+    Protected Overrides Sub OnHandleCreated(e As EventArgs)
+        MyBase.OnHandleCreated(e)
+        If Not String.IsNullOrEmpty(cueBanner) Then UpdateCueBanner()
+    End Sub
+
+    Private m_CueBanner As String
+    Public Property cueBanner As String
+        Get
+            Return m_CueBanner
+        End Get
+        Set(value As String)
+            m_CueBanner = value
+            UpdateCueBanner()
+        End Set
+    End Property
+
+    Private Sub UpdateCueBanner()
+        SendMessage(Handle, EM_SETCUEBANNER, 0, cueBanner)
+    End Sub
+
+End Class

Help/HelpBrowserForm.vb

@@ -4,6 +4,7 @@ Public Class HelpBrowserForm
 
     Dim TitleMsg As String = ""
     Dim CurrentSite As String = ""
+    Dim DocTitle As String = ""
 
     Private Sub HelpBrowserForm_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Select Case MainForm.Language
@@ -39,7 +40,12 @@ Public Class HelpBrowserForm
             Process.Start(e.Url.AbsoluteUri)
             WebBrowser1.Navigate(CurrentSite)
         End If
-        Text = WebBrowser1.DocumentTitle & " - " & TitleMsg
+        If WebBrowser1.DocumentTitle = "" Then
+            Text = DocTitle & " - " & TitleMsg
+        Else
+            Text = WebBrowser1.DocumentTitle & " - " & TitleMsg
+            If e.Url.AbsoluteUri.StartsWith("file:///") Then DocTitle = WebBrowser1.DocumentTitle
+        End If
         CurrentSite = e.Url.AbsoluteUri
     End Sub
 

Helpers/README.MD

@@ -15,6 +15,7 @@ We can provide a short description of all scripts in this directory:
 | `extbatch\options.bat` | (Functionality _to be added_) Options script that configures the Command Console |
 | `extps1\extappx.ps1` | The Extended AppX package getter script, which is run when managing online installations |
 | `extps1\mImgMgr.ps1` | The CLI version of the mounted image manager, which lets you manage your mounted Windows images |
+| `extps1\PE_Helper\PE_Helper.ps1` | The DISMTools Preinstallation Environment (PE) Helper |
 
 This list of scripts will be updated as we add new scripts in this directory.
 

Helpers/dthelper.bat

@@ -1,10 +1,10 @@
-:: DISMTools Helper Script - version 0.4.2
+:: DISMTools Helper Script - version 0.5
 @echo off
 
 
 :init
 :: Set initial vars
-set script_ver=v0.4.2
+set script_ver=v0.5
 set outputmode=0
 :: outputmode=0 (output to file)
 ::            1 (output to console)