[DynaLog] Massive improvements (12/29/2024)

Author: CodingWonders

MainForm.vb

@@ -850,6 +850,7 @@ Public Class MainForm
             DynaLog.LogMessage("System Theme   : " & Quote & ThemeDll & Quote)
             DynaLog.LogMessage("PrePolicy Theme: " & Quote & PrePol & Quote)
             If Not ThemeDll.Equals(PrePol, StringComparison.OrdinalIgnoreCase) Then
+                DynaLog.LogMessage("System Theme and PrePolicy Theme are different.")
                 DynaLog.LogMessage("A custom theme has been detected. There may be visual issues with DISMTools")
                 Dim msg As String = ""
                 Dim titleMsg As String = ""
@@ -889,6 +890,8 @@ Public Class MainForm
                         msg = "DISMTools ha rilevato che su questo sistema è stato impostato un tema personalizzato. Alcuni temi personalizzati fanno sì che il programma non abbia un aspetto corretto, quindi si consiglia di passare al tema predefinito."
                 End Select
                 MsgBox(msg, vbOKOnly + vbExclamation, titleMsg)
+            Else
+                DynaLog.LogMessage("System Theme and PrePolicy Theme are the same.")
             End If
         Catch ex As Exception
 

Panels/ISOFiles/ISOCreator.vb

@@ -370,38 +370,50 @@ Public Class ISOCreator
     End Sub
 
     Private Sub OpenFileDialog1_FileOk(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles OpenFileDialog1.FileOk
+        DynaLog.LogMessage("Source image file to test: " & Quote & OpenFileDialog1.FileName & Quote)
         TextBox1.Text = OpenFileDialog1.FileName
     End Sub
 
     Sub GetImageInfo(ImageFile As String)
+        DynaLog.LogMessage("Image file to get information about: " & Quote & ImageFile & Quote)
+        DynaLog.LogMessage("Checking if mounted image detector is busy...")
         ListView1.Items.Clear()
         If MainForm.MountedImageDetectorBW.IsBusy Then
+            DynaLog.LogMessage("Mounted image detector is busy. Stopping it...")
             MainForm.MountedImageDetectorBWRestarterTimer.Enabled = False
             MainForm.MountedImageDetectorBW.CancelAsync()
             While MainForm.MountedImageDetectorBW.IsBusy
                 Application.DoEvents()
                 Thread.Sleep(500)
             End While
         End If
+        DynaLog.LogMessage("Checking if image status watchers are busy...")
         MainForm.WatcherTimer.Enabled = False
+        DynaLog.LogMessage("Image status watchers might be busy. Stopping them if they are...")
         If MainForm.WatcherBW.IsBusy Then MainForm.WatcherBW.CancelAsync()
         While MainForm.WatcherBW.IsBusy
             Application.DoEvents()
             Thread.Sleep(100)
         End While
         Try
+            DynaLog.LogMessage("Initializing API...")
             DismApi.Initialize(DismLogLevel.LogErrors)
             ImageInfoCollection = DismApi.GetImageInfo(ImageFile)
-            For Each ImageInfo As DismImageInfo In ImageInfoCollection
-                ListView1.Items.Add(New ListViewItem(New String() {
-                                                     (ImageInfoCollection.IndexOf(ImageInfo) + 1),
-                                                     ImageInfo.ImageName,
-                                                     ImageInfo.ImageDescription,
-                                                     ImageInfo.ProductVersion.ToString(),
-                                                     Casters.CastDismArchitecture(ImageInfo.Architecture)
-                                                 }))
-            Next
+            DynaLog.LogMessage("Information collection count: " & ImageInfoCollection.Count)
+            If ImageInfoCollection.Count > 0 Then
+                DynaLog.LogMessage("This file has images. Updating lists...")
+                For Each ImageInfo As DismImageInfo In ImageInfoCollection
+                    ListView1.Items.Add(New ListViewItem(New String() {
+                                                         (ImageInfoCollection.IndexOf(ImageInfo) + 1),
+                                                         ImageInfo.ImageName,
+                                                         ImageInfo.ImageDescription,
+                                                         ImageInfo.ProductVersion.ToString(),
+                                                         Casters.CastDismArchitecture(ImageInfo.Architecture)
+                                                     }))
+                Next
+            End If
         Catch ex As Exception
+            DynaLog.LogMessage("Could not get image file information. Error message: " & ex.Message)
             Dim msg As String = ""
             Select Case MainForm.Language
                 Case 0
@@ -430,20 +442,26 @@ Public Class ISOCreator
             End Select
             MsgBox(msg, vbOKOnly + vbCritical, Label1.Text)
         Finally
+            DynaLog.LogMessage("Shutting down API...")
             Try
                 DismApi.Shutdown()
             Catch ex As Exception
                 ' Don't do anything
             End Try
         End Try
+        DynaLog.LogMessage("This process has finished.")
         Call MainForm.MountedImageDetectorBW.RunWorkerAsync()
     End Sub
 
     Private Sub SaveFileDialog1_FileOk(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles SaveFileDialog1.FileOk
+        DynaLog.LogMessage("Specified destination: " & Quote & SaveFileDialog1.FileName & Quote)
         TextBox3.Text = SaveFileDialog1.FileName
     End Sub
 
     Private Sub OK_Button_Click(sender As Object, e As EventArgs) Handles OK_Button.Click
+        DynaLog.LogMessage("Checking provided information...")
+        DynaLog.LogMessage("- Source image to add to ISO file: " & Quote & TextBox1.Text & Quote)
+        DynaLog.LogMessage("- Destination ISO file: " & Quote & TextBox3.Text & Quote)
         If TextBox1.Text = "" OrElse Not File.Exists(TextBox1.Text) Then
             Select Case MainForm.Language
                 Case 0
@@ -574,12 +592,19 @@ Public Class ISOCreator
 
     Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
         BackgroundWorker1.ReportProgress(0)
+        DynaLog.LogMessage("Starting PE Helper...")
+        DynaLog.LogMessage("- Task: generate ISO")
+        DynaLog.LogMessage("- Architecture: " & ComboBox1.SelectedItem)
+        DynaLog.LogMessage("- Image file to test: " & Quote & TextBox1.Text & Quote)
+        DynaLog.LogMessage("- Unattended answer file to try: " & Quote & TextBox4.Text & Quote)
+        DynaLog.LogMessage("- Destination ISO file: " & Quote & TextBox3.Text & Quote)
         Dim ISOCreator As New Process()
         ISOCreator.StartInfo.FileName = Environment.GetFolderPath(Environment.SpecialFolder.Windows) & "\system32\WindowsPowerShell\v1.0\powershell.exe"
         ISOCreator.StartInfo.WorkingDirectory = Application.StartupPath & "\bin\extps1\PE_Helper"
         ISOCreator.StartInfo.Arguments = "-noprofile -nologo -executionpolicy unrestricted -file " & Quote & Application.StartupPath & "\bin\extps1\PE_Helper\PE_Helper.ps1" & Quote & " -cmd StartPEGen -arch " & ComboBox1.SelectedItem & " -imgFile " & Quote & TextBox1.Text & Quote & " -isoPath " & Quote & TextBox3.Text & Quote & " -unattendFile " & Quote & TextBox4.Text & Quote
         ISOCreator.Start()
         ISOCreator.WaitForExit()
+        DynaLog.LogMessage("The PE Helper process finished with exit code " & Hex(ISOCreator.ExitCode))
         success = (ISOCreator.ExitCode = 0)
         BackgroundWorker1.ReportProgress(100)
     End Sub
@@ -600,6 +625,8 @@ Public Class ISOCreator
     End Sub
 
     Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
+        DynaLog.LogMessage("The PE Helper has finished.")
+        DynaLog.LogMessage("- Did it succeed? " & If(success, "Yes", "No"))
         Dim msg As String = ""
         Select Case MainForm.Language
             Case 0
@@ -636,6 +663,7 @@ Public Class ISOCreator
 
     Private Sub ISOCreator_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
         If BackgroundWorker1.IsBusy Then
+            DynaLog.LogMessage("The PE Helper is busy. Cancelling exit...")
             e.Cancel = True
             Beep()
         End If
@@ -644,12 +672,14 @@ Public Class ISOCreator
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
         PopupImageManager.Location = Button2.PointToScreen(Point.Empty)
         If PopupImageManager.ShowDialog() = DialogResult.OK Then
+            DynaLog.LogMessage("Selected image: " & PopupImageManager.selectedImgFile)
             TextBox1.Text = PopupImageManager.selectedImgFile
         End If
     End Sub
 
     Private Sub TextBox1_TextChanged(sender As Object, e As EventArgs) Handles TextBox1.TextChanged
         If TextBox1.Text <> "" And File.Exists(TextBox1.Text) Then
+            DynaLog.LogMessage("The specified file exists. Getting information...")
             GetImageInfo(TextBox1.Text)
         End If
     End Sub
@@ -699,6 +729,7 @@ Public Class ISOCreator
     End Sub
 
     Private Sub OpenFileDialog2_FileOk(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles OpenFileDialog2.FileOk
+        DynaLog.LogMessage("Unattended answer file to test: " & Quote & OpenFileDialog2.FileName & Quote)
         TextBox4.Text = OpenFileDialog2.FileName
     End Sub
 

Panels/ISOFiles/NewTestingEnv.vb

@@ -229,6 +229,7 @@ Public Class NewTestingEnv
 
     Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
         If FolderBrowserDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            DynaLog.LogMessage("Target location of testing environment files: " & Quote & FolderBrowserDialog1.SelectedPath & Quote)
             TextBox3.Text = FolderBrowserDialog1.SelectedPath
         End If
     End Sub
@@ -274,12 +275,17 @@ Public Class NewTestingEnv
 
     Private Sub BackgroundWorker1_DoWork(sender As Object, e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorker1.DoWork
         BackgroundWorker1.ReportProgress(0)
+        DynaLog.LogMessage("Starting PE Helper...")
+        DynaLog.LogMessage("- Task: generate testing environment")
+        DynaLog.LogMessage("- Architecture: " & ComboBox1.SelectedItem)
+        DynaLog.LogMessage("- Destination folder for testing environment: " & Quote & TextBox3.Text & Quote)
         Dim ISOCreator As New Process()
         ISOCreator.StartInfo.FileName = Environment.GetFolderPath(Environment.SpecialFolder.Windows) & "\system32\WindowsPowerShell\v1.0\powershell.exe"
         ISOCreator.StartInfo.WorkingDirectory = Application.StartupPath & "\bin\extps1\PE_Helper"
         ISOCreator.StartInfo.Arguments = "-noprofile -nologo -executionpolicy unrestricted -file " & Quote & Application.StartupPath & "\bin\extps1\PE_Helper\PE_Helper.ps1" & Quote & " -cmd StartDevelopment -testArch " & ComboBox1.SelectedItem & " -targetPath " & Quote & TextBox3.Text & Quote
         ISOCreator.Start()
         ISOCreator.WaitForExit()
+        DynaLog.LogMessage("The PE Helper process finished with exit code " & Hex(ISOCreator.ExitCode))
         success = (ISOCreator.ExitCode = 0)
         BackgroundWorker1.ReportProgress(100)
     End Sub
@@ -298,6 +304,8 @@ Public Class NewTestingEnv
     End Sub
 
     Private Sub BackgroundWorker1_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorker1.RunWorkerCompleted
+        DynaLog.LogMessage("The PE Helper has finished.")
+        DynaLog.LogMessage("- Did it succeed? " & If(success, "Yes", "No"))
         Dim msg As String = ""
         Select Case MainForm.Language
             Case 0

Panels/Img_Ops/ApplicationDriveSpecifier.vb

@@ -20,9 +20,11 @@ Public Class ApplicationDriveSpecifier
     End Sub
 
     Sub ListDisks()
+        DynaLog.LogMessage("Preparing to list disks...")
         ListView1.Items.Clear()
         Dim searcher As ManagementObjectSearcher = New ManagementObjectSearcher("SELECT DeviceID, Model, Partitions, Size FROM Win32_DiskDrive")
         Dim dskResults As ManagementObjectCollection = searcher.Get()
+        DynaLog.LogMessage("Management object searcher returned " & dskResults.Count & " result(s)")
         For Each result As ManagementObject In dskResults
             ListView1.Items.Add(New ListViewItem(New String() {result("DeviceID"), result("Model"), result("Partitions"), result("Size") & " (~" & Converters.BytesToReadableSize(result("Size")) & ")"}))
         Next
@@ -156,6 +158,7 @@ Public Class ApplicationDriveSpecifier
     End Sub
 
     Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        DynaLog.LogMessage("Refreshing lists...")
         ListDisks()
     End Sub
 

Panels/Img_Ops/ImgAppend.vb

@@ -7,8 +7,11 @@ Public Class ImgAppend
 
     Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
         Dim msg As String = ""
+        DynaLog.LogMessage("Disposing of progress panel if not disposed of previously...")
         If Not ProgressPanel.IsDisposed Then ProgressPanel.Dispose()
+        DynaLog.LogMessage("Checking source image directory...")
         If TextBox1.Text = "" Or Not Directory.Exists(TextBox1.Text) Then
+            DynaLog.LogMessage("Either no source directory has been specified or it does not exist in the file system.")
             Select Case MainForm.Language
                 Case 0
                     Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
@@ -39,7 +42,9 @@ Public Class ImgAppend
         Else
             ProgressPanel.AppendixSourceDir = TextBox1.Text
         End If
+        DynaLog.LogMessage("Checking destination image...")
         If TextBox2.Text = "" Or Not File.Exists(TextBox2.Text) Then
+            DynaLog.LogMessage("Either no destination image has been specified or it does not exist in the file system.")
             Select Case MainForm.Language
                 Case 0
                     Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
@@ -70,7 +75,9 @@ Public Class ImgAppend
         Else
             ProgressPanel.AppendixDestinationImage = TextBox2.Text
         End If
+        DynaLog.LogMessage("Checking name of image to append to destination...")
         If TextBox3.Text = "" Then
+            DynaLog.LogMessage("No name has been specified.")
             Select Case MainForm.Language
                 Case 0
                     Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
@@ -103,9 +110,13 @@ Public Class ImgAppend
         End If
         ProgressPanel.AppendixDescription = TextBox4.Text
         If CheckBox1.Checked Then
+            DynaLog.LogMessage("A configuration list file is expected to be used. Checking specified file...")
             If TextBox5.Text <> "" And File.Exists(TextBox5.Text) Then
+                DynaLog.LogMessage("A configuration list file has been specified and it exists in the file system.")
                 ProgressPanel.AppendixWimScriptConfig = TextBox5.Text
             Else
+                DynaLog.LogMessage("Either no configuration list file has been specified or it does not exist in the file system.")
+                DynaLog.LogMessage("We can continue without it, but that may not be what the user wants. Asking...")
                 Select Case MainForm.Language
                     Case 0
                         Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
@@ -132,12 +143,15 @@ Public Class ImgAppend
                         msg = "Non è stato specificato alcun file dell'elenco di configurazione oppure non è stato possibile rilevare il file dell'elenco di configurazione nel file system. Si desidera continuare senza alcun file dell'elenco di configurazione?"
                 End Select
                 If MsgBox(msg, vbYesNo + vbCritical, Label1.Text) = MsgBoxResult.Ok Then
+                    DynaLog.LogMessage("The user does not mind if we continue without the configuration list file.")
                     ProgressPanel.AppendixWimScriptConfig = ""
                 Else
+                    DynaLog.LogMessage("The user wants the configuration list file.")
                     Exit Sub
                 End If
             End If
         Else
+            DynaLog.LogMessage("A configuration list file is not expected to be used.")
             ProgressPanel.AppendixWimScriptConfig = ""
         End If
         ProgressPanel.AppendixUseWimBoot = CheckBox2.Checked
@@ -442,6 +456,7 @@ Public Class ImgAppend
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         If FolderBrowserDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then
+            DynaLog.LogMessage("Selected source directory: " & Quote & FolderBrowserDialog1.SelectedPath & Quote)
             TextBox1.Text = FolderBrowserDialog1.SelectedPath
         End If
     End Sub
@@ -451,6 +466,7 @@ Public Class ImgAppend
     End Sub
 
     Private Sub SaveFileDialog1_FileOk(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles SaveFileDialog1.FileOk
+        DynaLog.LogMessage("Selected destination image file: " & Quote & SaveFileDialog1.FileName & Quote)
         TextBox2.Text = SaveFileDialog1.FileName
     End Sub
 
@@ -489,34 +505,46 @@ Public Class ImgAppend
     End Sub
 
     Function GetLastImageName() As String
+        DynaLog.LogMessage("Image file to get information about: " & Quote & TextBox2.Text & Quote)
         Dim imageName As String = ""
         Try
+            DynaLog.LogMessage("Initializing API...")
             DismApi.Initialize(DismLogLevel.LogErrors)
             Dim ImageInfoCollection As DismImageInfoCollection = DismApi.GetImageInfo(TextBox2.Text)
+            DynaLog.LogMessage("Information collection count: " & ImageInfoCollection.Count)
+            DynaLog.LogMessage("Getting name of last index...")
             imageName = ImageInfoCollection.Last.ImageName
         Catch ex As Exception
+            DynaLog.LogMessage("Could not get image file information. Error message: " & ex.Message)
             MsgBox("Could not grab last image name. Error information:" & CrLf & CrLf & ex.ToString(), vbOKOnly + vbCritical, Label1.Text)
         Finally
             Try
+                DynaLog.LogMessage("Shutting down API...")
                 DismApi.Shutdown()
             Catch ex As Exception
                 ' Don't do anything
             End Try
         End Try
+        DynaLog.LogMessage("Name of last image: " & imageName)
         Return imageName
     End Function
 
     Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+        DynaLog.LogMessage("Checking if the destination file has been specified and exists...")
         If TextBox2.Text = "" OrElse Not File.Exists(TextBox2.Text) Then Exit Sub
+        DynaLog.LogMessage("Checking if mounted image detector is busy...")
         If MainForm.MountedImageDetectorBW.IsBusy Then
+            DynaLog.LogMessage("Mounted image detector is busy. Stopping it...")
             MainForm.MountedImageDetectorBWRestarterTimer.Enabled = False
             MainForm.MountedImageDetectorBW.CancelAsync()
             While MainForm.MountedImageDetectorBW.IsBusy
                 Application.DoEvents()
                 Threading.Thread.Sleep(500)
             End While
         End If
+        DynaLog.LogMessage("Checking if image status watchers are busy...")
         MainForm.WatcherTimer.Enabled = False
+        DynaLog.LogMessage("Image status watchers might be busy. Stopping them if they are...")
         If MainForm.WatcherBW.IsBusy Then MainForm.WatcherBW.CancelAsync()
         While MainForm.WatcherBW.IsBusy
             Application.DoEvents()