Added right-click option to image disk from disk view window

Added percentage status to progress form Made progress labels more meaningful Anchored progress labels Reduced Progress.Show usage as it was being called too often Added "total time taken" to progress window Re-ordered log file entries for easier readability The generated Logfile is now named after the image file itself Removed legacy default file type of DD when saving the image Adjusted "Time Taken" values to account for > 24 hours duration, i.e. HHH instead of HH Removed "Choose image type" to default of E01 Ensured that if the image selection is changed, the E01 or DD extension follows the change Added check for the needed DLL files at startup.
tedsmith · Jul 30, 2015 · a7f3f61 · a7f3f61
1 parent 044255e
commit a7f3f61
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 104 deletions.
diff --git a/Acknowledgements.txt b/Acknowledgements.txt
@@ -104,7 +104,8 @@ https://s-media-cache-ak0.pinimg.com/236x/66/01/34/660134fcbb68c49d97d24d2b81eb3
 and logo created by layer merging using The GIMP by Ted Smith 
 
 MSVCR100.dll is needed for use with Windows XP (where the DLL may not be present by default) 
-and is part of the Microsoft Windows DLL libraries. 
+and is part of the Microsoft Windows DLL libraries. The one provided with YAFFI is from
+http://www.dll-files.com/dllindex/dll-files.shtml?msvcr100 
 
 LibEWF.dll sourced from http://www.isobuster.com/tips/build_libewf_dll_for_isobuster 
 and built using Borland compiler for use with Delphi and Freepascal, dated 8th June 2014.

diff --git a/uprogress.lfm b/uprogress.lfm
@@ -1,12 +1,15 @@
 object frmProgress: TfrmProgress
   Left = 647
   Height = 207
+  Hint = 'Close this window if you wish to abort.'
   Top = 272
   Width = 402
   Caption = 'YAFFI - Progress Window'
   ClientHeight = 207
   ClientWidth = 402
+  OnCloseQuery = FormCloseQuery
   Position = poDesktopCenter
+  ShowHint = True
   LCLVersion = '1.4.0.4'
   object GroupBox1: TGroupBox
     Left = 8
@@ -34,7 +37,6 @@ object frmProgress: TfrmProgress
       ParentColor = False
     end
     object lblTotalBytesRead: TLabel
-      AnchorSideRight.Control = Label9
       Left = 8
       Height = 13
       Top = 48
@@ -43,16 +45,10 @@ object frmProgress: TfrmProgress
       Caption = '...'
       ParentColor = False
     end
-    object Label9: TLabel
-      Left = 112
-      Height = 13
-      Top = 48
-      Width = 4
-      Caption = '/'
-      ParentColor = False
-    end
     object lblTotalBytesSource: TLabel
-      Left = 136
+      AnchorSideLeft.Control = lblTotalBytesRead
+      AnchorSideLeft.Side = asrBottom
+      Left = 25
       Height = 13
       Top = 48
       Width = 12
@@ -68,5 +64,15 @@ object frmProgress: TfrmProgress
       TabOrder = 0
       BarShowText = True
     end
+    object lblPercent: TLabel
+      AnchorSideLeft.Control = lblTotalBytesSource
+      AnchorSideLeft.Side = asrBottom
+      Left = 37
+      Height = 13
+      Top = 48
+      Width = 12
+      Caption = '...'
+      ParentColor = False
+    end
   end
 end
diff --git a/uprogress.pas b/uprogress.pas
@@ -14,12 +14,13 @@ interface
 
   TfrmProgress = class(TForm)
     GroupBox1: TGroupBox;
+    lblPercent: TLabel;
     Label6: TLabel;
     Label7: TLabel;
-    Label9: TLabel;
     lblTotalBytesSource: TLabel;
     lblTotalBytesRead: TLabel;
     ProgressBar1: TProgressBar;
+    procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
   private
     { private declarations }
   public
@@ -31,10 +32,18 @@   TfrmProgress = class(TForm)
 
 implementation
 
+uses
+  uYaffi;
 {$R *.lfm}
 
 { TfrmProgress }
 
 
+procedure TfrmProgress.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+begin
+  Label7.Caption:= 'Aborting...';
+  frmYaffi.Stop:= true;
+end;
+
 end.
 
diff --git a/uyaffi.lfm b/uyaffi.lfm
@@ -1,11 +1,11 @@
 object frmYaffi: TfrmYaffi
   Left = 407
-  Height = 682
+  Height = 668
   Top = 62
-  Width = 737
+  Width = 732
   Caption = 'YAFFI (Yet Another Free Forensic Imager) by Ted Smith (c) 2015'
-  ClientHeight = 682
-  ClientWidth = 737
+  ClientHeight = 668
+  ClientWidth = 732
   DefaultMonitor = dmDesktop
   OnCreate = FormCreate
   OnShow = btnRefreshDiskListClick
@@ -101,17 +101,17 @@ object frmYaffi: TfrmYaffi
     Left = 16
     Height = 640
     Top = 16
-    Width = 702
+    Width = 704
     Anchors = [akTop, akLeft, akRight]
     Caption = 'Disk Imaging'
     ClientHeight = 622
-    ClientWidth = 698
+    ClientWidth = 700
     TabOrder = 1
     object TreeView1: TTreeView
       Left = 8
       Height = 136
       Top = 8
-      Width = 666
+      Width = 680
       Anchors = [akTop, akLeft, akRight]
       DefaultItemHeight = 16
       PopupMenu = PopupMenu1
@@ -124,7 +124,7 @@ object frmYaffi: TfrmYaffi
       Left = 144
       Height = 21
       Top = 171
-      Width = 530
+      Width = 544
       Anchors = [akTop, akLeft, akRight]
       Color = clGradientInactiveCaption
       EditLabel.AnchorSideLeft.Control = ledtSelectedItem
@@ -134,7 +134,7 @@ object frmYaffi: TfrmYaffi
       EditLabel.Left = 144
       EditLabel.Height = 13
       EditLabel.Top = 155
-      EditLabel.Width = 530
+      EditLabel.Width = 544
       EditLabel.Caption = 'Selected Item:'
       EditLabel.ParentColor = False
       TabOrder = 20
@@ -144,7 +144,7 @@ object frmYaffi: TfrmYaffi
       Left = 144
       Height = 21
       Top = 212
-      Width = 530
+      Width = 544
       Anchors = [akTop, akLeft, akRight]
       Color = clGradientInactiveCaption
       EditLabel.AnchorSideLeft.Control = ledtImageName
@@ -154,7 +154,7 @@ object frmYaffi: TfrmYaffi
       EditLabel.Left = 144
       EditLabel.Height = 13
       EditLabel.Top = 196
-      EditLabel.Width = 530
+      EditLabel.Width = 544
       EditLabel.Caption = 'Image Name and Path'
       EditLabel.ParentColor = False
       TabOrder = 2
@@ -220,13 +220,14 @@ object frmYaffi: TfrmYaffi
       Top = 264
       Width = 120
       ItemHeight = 13
+      ItemIndex = 0
       Items.Strings = (
         'E01'
         'DD'
       )
       OnSelect = ComboImageTypeSelect
       TabOrder = 8
-      Text = 'Choose Image Type'
+      Text = 'E01'
     end
     object btnStartImaging: TButton
       Left = 568
@@ -828,7 +829,6 @@ object frmYaffi: TfrmYaffi
   end
   object SaveImageDialog: TSaveDialog
     Title = 'Save Image As...'
-    DefaultExt = '.dd'
     left = 464
     top = 240
   end
@@ -843,5 +843,9 @@ object frmYaffi: TfrmYaffi
       Caption = 'Show Disk Technical Data'
       OnClick = GetDiskTechnicalSpecs
     end
+    object MenuItem1: TMenuItem
+      Caption = 'Image this disk...'
+      OnClick = btnChooseImageNameClick
+    end
   end
 end