Merge pull request #27 from CodingWonders/dt_pre_2384

DISMTools 0.3.1 Preview 4

Author: CodingWonders

DISMTools.vbproj

@@ -160,6 +160,12 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Panels\ConfigLists\AddListEntryDlg.Designer.vb">
+      <DependentUpon>AddListEntryDlg.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Panels\ConfigLists\AddListEntryDlg.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Panels\ConfigLists\WimScriptEditor.Designer.vb">
       <DependentUpon>WimScriptEditor.vb</DependentUpon>
     </Compile>
@@ -576,6 +582,9 @@
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Panels\ConfigLists\AddListEntryDlg.resx">
+      <DependentUpon>AddListEntryDlg.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Panels\ConfigLists\WimScriptEditor.resx">
       <DependentUpon>WimScriptEditor.vb</DependentUpon>
     </EmbeddedResource>

Installer/Output/dt_setup.exe

@@ -213,6 +213,9 @@ Public Class MainForm
 
     Dim SysVer As Version
 
+    ' List for driver information dialog
+    Dim DriverInfoList As DismDriverPackageCollection
+
     Friend NotInheritable Class NativeMethods
 
         Private Sub New()
@@ -3152,6 +3155,7 @@ Public Class MainForm
                     Dim imgDrvVersionList As New List(Of String)
                     Dim imgDrvBootCriticalStatusList As New List(Of Boolean)
                     Dim DriverCollection As DismDriverPackageCollection = DismApi.GetDrivers(session, AllDrivers)
+                    DriverInfoList = DriverCollection
                     For Each driver As DismDriverPackage In DriverCollection
                         If ImgBW.CancellationPending Then
                             If UseApi And session IsNot Nothing Then DismApi.CloseSession(session)
@@ -7767,6 +7771,13 @@ Public Class MainForm
             Beep()
             Exit Sub
         End If
+        If WimScriptEditor.Visible Then
+            WimScriptEditor.Close()
+            If WimScriptEditor.Visible Then
+                e.Cancel = True
+                Exit Sub
+            End If
+        End If
         If Not VolatileMode Then
             SaveDTSettings()
         End If
@@ -7849,6 +7860,10 @@ Public Class MainForm
     End Sub
 
     Private Sub GetImageInfo_Click(sender As Object, e As EventArgs) Handles GetImageInfo.Click
+        If ImgBW.IsBusy Then
+            BGProcsBusyDialog.ShowDialog()
+            Exit Sub
+        End If
         GetImgInfoDlg.ShowDialog()
     End Sub
 
@@ -10135,11 +10150,30 @@ Public Class MainForm
     End Sub
 
     Private Sub GetDrivers_Click(sender As Object, e As EventArgs) Handles GetDrivers.Click
+        ProgressPanel.OperationNum = 994
+        Select Case Language
+            Case 0
+                Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
+                    Case "ENG"
+                        PleaseWaitDialog.Label2.Text = "Getting installed driver packages..."
+                    Case "ESN"
+                        PleaseWaitDialog.Label2.Text = "Obteniendo paquetes de controladores instalados..."
+                End Select
+            Case 1
+                PleaseWaitDialog.Label2.Text = "Getting installed driver packages..."
+            Case 2
+                PleaseWaitDialog.Label2.Text = "Obteniendo paquetes de controladores instalados..."
+        End Select
+        If Not CompletedTasks(4) Then
+            PleaseWaitDialog.ShowDialog(Me)
+            Exit Sub
+        End If
         If MountedImageDetectorBW.IsBusy Then MountedImageDetectorBW.CancelAsync()
         While MountedImageDetectorBW.IsBusy
             Application.DoEvents()
             Thread.Sleep(500)
         End While
+        If DriverInfoList IsNot Nothing Then GetDriverInfo.InstalledDriverInfo = DriverInfoList
         GetDriverInfo.ShowDialog()
     End Sub
 

MainForm.Designer.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.3.1.2383")> 
-<Assembly: AssemblyFileVersion("0.3.1.2383")> 
+<Assembly: AssemblyVersion("0.3.1.2384")> 
+<Assembly: AssemblyFileVersion("0.3.1.2384")> 

MainForm.vb

@@ -1072,15 +1072,20 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   <data name="WhatsNew" xml:space="preserve">
     <value>Bugfixes
 
-- Fixed an issue that caused the program to make you specify a capability addition source in the online installation management mode when the "Limit Windows Update access" check box was unticked
+- Fixed an issue where the driver information dialog would always display the hardware target after the one you'd selected
+- Fixed an issue where the mounted image detector would start even if it had already been started
+- Fixed an issue where package removal would fail if its information process had thrown an exception
+- If the aforementioned information process has thrown an exception, the program will now output the HResult property of the exception instead of a constant value
 
 New features
 
-- When a driver file contains more than 10 hardware targets, the program now shows the file name of the driver file for a quicker and easier reference task
-- The mounted image detector has received optimizations which cause a significant CPU usage decrease
-- If an ESD file is specified in the source image field of the image mount dialog, the image conversion dialog will now appear automatically
-- The image conversion dialog can now convert the index you specify, as opposed to the first index
-- If background processes were canceled prematurely and image information tasks are still pending, those tasks will now run after the task related to what has changed</value>
+- You can now jump to specific hardware targets in the driver information dialog
+- The image conversion and SWM file merger dialogs have received translations
+- The SWM file merger dialog can now merge files for the index you specify, as opposed to for the first index
+- The image mount dialog now offers an automatic merger of SWM files, if one is specified
+- You can now get information about drivers installed in the Windows image or in the active installation, and the program will now detect image drivers if the "Detect all drivers" option value is different from the one stored in the program settings
+- You can now get information about an image file on demand
+- Introduced the DISM Configuration List Editor</value>
   </data>
   <data name="jumpto" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\jumpto.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>